change test flow(only use A1 trigger error event)

Author: 0xverin

tee-worker/ts-tests/indirect_error_calls.ts

@@ -161,27 +161,28 @@ export async function requestErrorVCs(
     aesKey: HexString,
     listening: boolean,
     mrEnclave: HexString,
-    assertion: Assertion
+    assertion: Assertion,
+    keys: string[]
 ): Promise<Event[] | undefined> {
     let txs: TransactionSubmit[] = [];
-    let len = 0;
     const nonce = await context.substrate.rpc.system.accountNextIndex(signer.address);
 
-    for (const key in assertion) {
-        len++;
+    for (let index = 0; index < keys.length; index++) {
+        const key = keys[index];
         const tx = context.substrate.tx.vcManagement.requestVc(mrEnclave, {
             [key]: assertion[key as keyof Assertion],
         });
-
-        let newNonce = nonce.toNumber() + (len - 1);
+        let newNonce = nonce.toNumber() + index;
         txs.push({ tx, nonce: newNonce });
     }
 
+   
+
     await sendTxUntilInBlockList(context.substrate, txs, signer);
 
     if (listening) {
         const events = (await listenEvent(context.substrate, 'vcManagement', ['StfError'])) as Event[];
-        expect(events.length).to.be.equal(len);
+        expect(events.length).to.be.equal(keys.length);
         return events;
     }
     return undefined;

tee-worker/ts-tests/vc.test.ts

@@ -19,6 +19,10 @@ const assertion = <Assertion>{
     A10: [10],
     A11: [10],
 };
+
+
+// it doesn't make much difference test A1 only vs test A1 - A11, one VC type is enough.
+//So only use A1 to trigger the wrong event
 describeLitentry('VC test', async (context) => {
     const aesKey = '0x22fc82db5b606998ad45099b7978b5b4f9dd4ea6017e57370ac56141caaabd12';
     var indexList: HexString[] = [];
@@ -60,14 +64,15 @@ describeLitentry('VC test', async (context) => {
             indexList.push(res[k].index);
         }
     });
-    step('Request Error VC', async () => {
+    step('Request Error VC(A1)', async () => {
         const resp_request_error = (await requestErrorVCs(
             context,
             context.defaultSigner[1],
             aesKey,
             true,
             context.mrEnclave,
-            assertion
+            assertion,
+            ['A1']
         )) as Event[];
 
         await checkFailReason(resp_request_error, 'User shielding key is missing', true);
@@ -80,13 +85,14 @@ describeLitentry('VC test', async (context) => {
             assert.equal(registry.toHuman()!['status'], 'Disabled');
         }
     });
-    step('Disable error VC', async () => {
-        //Alice has already disabled the VC
+    step('Disable error VC(A1)', async () => {
+        //Alice has already disabled the A1 VC
         const resp_disable_error = (await disableErrorVCs(
             context,
             context.defaultSigner[0],
             true,
-            indexList
+
+            [indexList[0]]
         )) as HexString[];
         await checkFailReason(resp_disable_error, 'vcManagement.VCAlreadyDisabled', false);
     });
@@ -100,14 +106,11 @@ describeLitentry('VC test', async (context) => {
         }
     });
 
-    step('Revoke Error VC', async () => {
-        //Alice has already revoked the VC
-        const resp_revoke_error = (await revokeErrorVCs(
-            context,
-            context.defaultSigner[0],
-            true,
-            indexList
-        )) as string[];
+    step('Revoke Error VC(A1)', async () => {
+        //Alice has already revoked the A1 VC
+        const resp_revoke_error = (await revokeErrorVCs(context, context.defaultSigner[0], true, [
+            indexList[0],
+        ])) as string[];
         await checkFailReason(resp_revoke_error, 'vcManagement.VCNotExist', false);
     });
 });