updated tests & verifiers fix

Signed-off-by: Alex Shorsher <[email protected]>
hyperledger · Aug 25, 2022 · ff49eb2 · ff49eb2
1 parent d940ce5
commit ff49eb2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/server/src/controllers/common.ts b/server/src/controllers/common.ts
@@ -35,7 +35,7 @@ export class CommonController {
   async verifiers(): Promise<Verifier[]> {
     try {
       const orgs = await firefly.getOrganizations();
-      let verifiers = await firefly.getVerifiers('ff_system');
+      let verifiers = await firefly.getVerifiers('default');
       if (verifiers.length === 0) {
         // attempt to query legacy ff_system verifiers
         verifiers = await firefly.getVerifiers('ff_system');

diff --git a/server/test/common.test.ts b/server/test/common.test.ts
@@ -62,7 +62,6 @@ describe('Common Operations', () => {
 
     mockFireFly.getOrganizations.mockResolvedValueOnce(orgs);
     mockFireFly.getVerifiers.mockResolvedValueOnce(verifiers);
-    mockFireFly.getVerifiers.mockResolvedValueOnce([]);
 
     await request(server)
       .get('/api/common/verifiers')
@@ -71,8 +70,5 @@ describe('Common Operations', () => {
 
     expect(mockFireFly.getOrganizations).toHaveBeenCalledWith();
     expect(mockFireFly.getVerifiers).toHaveBeenCalledWith('default');
-
-    expect(mockFireFly.getOrganizations).toHaveBeenCalledWith();
-    expect(mockFireFly.getVerifiers).toHaveBeenCalledWith('ff_system');
   });
 });
diff --git a/server/test/contracts.template.test.ts b/server/test/contracts.template.test.ts
@@ -127,6 +127,7 @@ describe('Templates: Smart Contracts', () => {
             topic: 'app1',
             apiName: 'api1',
             eventPath: 'set',
+            firstEvent: 'newest',
           }),
         ).toBe(
           formatTemplate(`
@@ -135,6 +136,9 @@ describe('Templates: Smart Contracts', () => {
               'set',
               {
                 topic: 'app1',
+                options: {
+                  firstEvent: 'newest',
+                }
               },
             );
             return {

diff --git a/server/test/contracts.test.ts b/server/test/contracts.test.ts
@@ -226,6 +226,7 @@ describe('Smart Contracts', () => {
       apiName: 'my-api',
       eventPath: 'Changed',
       topic: 'my-app',
+      firstEvent: 'newest'
     };
     const listener = {
       id: 'listener1',
@@ -245,6 +246,9 @@ describe('Smart Contracts', () => {
 
     expect(mockFireFly.createContractAPIListener).toHaveBeenCalledWith('my-api', 'Changed', {
       topic: 'my-app',
+      options: {
+        firstEvent: 'newest',
+      },
     });
   });
 });
diff --git a/server/test/tokens.template.test.ts b/server/test/tokens.template.test.ts
@@ -16,6 +16,7 @@ describe('Templates: Tokens', () => {
             symbol: 'P1',
             type: 'fungible',
             address: undefined,
+            blockNumber: '0',
           }),
         ).toBe(
           formatTemplate(`
@@ -24,6 +25,7 @@ describe('Templates: Tokens', () => {
               symbol: 'P1',
               type: 'fungible',
               config: {
+                blockNumber: '0',
               }
             });
             return { type: 'token_pool', id: pool.id };