Fix tests (#10)

* wip - tests * t * t * wf * wf * fix branch name * made default branch `main` for consistency with other repos # Conflicts: # .github/.workflows/test.yaml * rm wf * fix wf
Abstract-Foundation · Oct 30, 2024 · c1f887a · c1f887a
1 parent 3dbd62b
commit c1f887a
Show file tree

Hide file tree

Showing 20 changed files with 458 additions and 230 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -21,6 +21,9 @@ jobs:
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
+      - name: Install dependencies
+        run: |
+          npm install
       - name: Build
         run: |
           npm run compile

diff --git a/test/accounts/managers/hookmanager.test.ts b/test/accounts/managers/hookmanager.test.ts
@@ -20,7 +20,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
     let deployer: ClaveDeployer;
     let provider: Provider;
     let richWallet: Wallet;
-    let teeValidator: Contract;
+    let eoaValidator: Contract;
     let account: Contract;
     let wallet: HDNodeWallet;
 
@@ -31,10 +31,10 @@ describe('Clave Contracts - Hook Manager tests', () => {
             cacheTimeout: -1,
         });
 
-        [, , , , teeValidator, account, wallet] = await fixture(
+        ({ eoaValidator, account, wallet } = await fixture(
             deployer,
             VALIDATORS.EOA,
-        );
+        ));
 
         const accountAddress = await account.getAddress();
 
@@ -64,7 +64,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                 await addHook(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     validationHook,
                     HOOKS.VALIDATION,
                     wallet,
@@ -108,7 +108,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                     provider,
                     account,
                     transfer,
-                    await teeValidator.getAddress(),
+                    await eoaValidator.getAddress(),
                     wallet,
                     hookData,
                 );
@@ -130,7 +130,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                 await removeHook(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     validationHook,
                     HOOKS.VALIDATION,
                     wallet,
@@ -162,7 +162,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                 await addHook(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     executionHook,
                     HOOKS.EXECUTION,
                     wallet,
@@ -184,7 +184,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                 await removeHook(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     executionHook,
                     HOOKS.EXECUTION,
                     wallet,
@@ -247,7 +247,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                     await addHook(
                         provider,
                         account,
-                        teeValidator,
+                        eoaValidator,
                         new Contract(await noInterfaceHook.getAddress(), []),
                         HOOKS.VALIDATION,
                         wallet,
@@ -259,7 +259,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                     await addHook(
                         provider,
                         account,
-                        teeValidator,
+                        eoaValidator,
                         new Contract(await noInterfaceHook.getAddress(), []),
                         HOOKS.EXECUTION,
                         wallet,
@@ -282,7 +282,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                     provider,
                     account,
                     addHookTx,
-                    await teeValidator.getAddress(),
+                    await eoaValidator.getAddress(),
                     wallet,
                 );
 
@@ -300,7 +300,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                     await addHook(
                         provider,
                         account,
-                        teeValidator,
+                        eoaValidator,
                         validationHook,
                         HOOKS.VALIDATION,
                         wallet,
@@ -320,7 +320,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                     await addHook(
                         provider,
                         account,
-                        teeValidator,
+                        eoaValidator,
                         executionHook,
                         HOOKS.EXECUTION,
                         wallet,
@@ -370,7 +370,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                         provider,
                         account,
                         transfer,
-                        await teeValidator.getAddress(),
+                        await eoaValidator.getAddress(),
                         wallet,
                         hookData,
                     );
@@ -396,7 +396,7 @@ describe('Clave Contracts - Hook Manager tests', () => {
                         provider,
                         account,
                         transfer,
-                        await teeValidator.getAddress(),
+                        await eoaValidator.getAddress(),
                         wallet,
                         hookData,
                     );

diff --git a/test/accounts/managers/modulemanager.test.ts b/test/accounts/managers/modulemanager.test.ts
@@ -20,7 +20,7 @@ describe('Clave Contracts - Module Manager tests', () => {
     let deployer: ClaveDeployer;
     let provider: Provider;
     let richWallet: Wallet;
-    let teeValidator: Contract;
+    let eoaValidator: Contract;
     let account: Contract;
     let wallet: HDNodeWallet;
 
@@ -31,10 +31,10 @@ describe('Clave Contracts - Module Manager tests', () => {
             cacheTimeout: -1,
         });
 
-        [, , , , teeValidator, account, wallet] = await fixture(
+        ({eoaValidator, account, wallet} = await fixture(
             deployer,
             VALIDATORS.EOA,
-        );
+        ));
 
         const accountAddress = await account.getAddress();
 
@@ -64,7 +64,7 @@ describe('Clave Contracts - Module Manager tests', () => {
                 await addModule(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     mockModule,
                     initData,
                     wallet,
@@ -116,7 +116,7 @@ describe('Clave Contracts - Module Manager tests', () => {
                 await removeModule(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     mockModule,
                     wallet,
                 );
@@ -164,7 +164,7 @@ describe('Clave Contracts - Module Manager tests', () => {
                 await addModule(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     newMockModule,
                     initData,
                     wallet,
@@ -192,7 +192,7 @@ describe('Clave Contracts - Module Manager tests', () => {
                     provider,
                     account,
                     addModuleTx,
-                    await teeValidator.getAddress(),
+                    await eoaValidator.getAddress(),
                     wallet,
                 );
 
@@ -216,7 +216,7 @@ describe('Clave Contracts - Module Manager tests', () => {
                     await addModule(
                         provider,
                         account,
-                        teeValidator,
+                        eoaValidator,
                         new Contract(await noInterfaceModule.getAddress(), []),
                         initData,
                         wallet,

diff --git a/test/accounts/managers/ownermanager.test.ts b/test/accounts/managers/ownermanager.test.ts
@@ -24,11 +24,13 @@ import {
 import { VALIDATORS } from '../../utils/names';
 import { encodePublicKey, genKey } from '../../utils/p256';
 import { ethTransfer, prepareEOATx, prepareTeeTx } from '../../utils/transactions';
+import { addR1Validator } from '../../utils/managers/validatormanager';
 
 describe('Clave Contracts - Owner Manager tests', () => {
     let deployer: ClaveDeployer;
     let provider: Provider;
     let richWallet: Wallet;
+    let eoaValidator: Contract;
     let teeValidator: Contract;
     let account: Contract;
     let wallet: HDNodeWallet;
@@ -40,10 +42,10 @@ describe('Clave Contracts - Owner Manager tests', () => {
             cacheTimeout: -1,
         });
 
-        [, , , , teeValidator, account, wallet] = await fixture(
+        ({eoaValidator, teeValidator, account, wallet}= await fixture(
             deployer,
             VALIDATORS.EOA,
-        );
+        ));
 
         const accountAddress = await account.getAddress();
 
@@ -63,12 +65,20 @@ describe('Clave Contracts - Owner Manager tests', () => {
                 newKeyPair = genKey();
                 newPublicKey = encodePublicKey(newKeyPair);
 
+                await addR1Validator(
+                    provider,
+                    account,
+                    eoaValidator,
+                    teeValidator,
+                    wallet,
+                );
+
                 expect(await account.r1IsOwner(newPublicKey)).to.be.false;
 
                 await addR1Key(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     newPublicKey,
                     wallet,
                 );
@@ -90,12 +100,13 @@ describe('Clave Contracts - Owner Manager tests', () => {
                 );
 
                 const txData = ethTransfer(richAddress, amount);
-                const tx = await prepareEOATx(
+
+                const tx = await prepareTeeTx(
                     provider,
                     account,
                     txData,
                     await teeValidator.getAddress(),
-                    wallet,
+                    newKeyPair,
                 );
                 const txReceipt = await provider.broadcastTransaction(
                     utils.serializeEip712(tx),
@@ -114,7 +125,7 @@ describe('Clave Contracts - Owner Manager tests', () => {
                 await removeR1Key(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     newPublicKey,
                     wallet,
                 );
@@ -157,7 +168,7 @@ describe('Clave Contracts - Owner Manager tests', () => {
                 await addK1Key(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     newK1Address,
                     wallet,
                 );
@@ -174,7 +185,7 @@ describe('Clave Contracts - Owner Manager tests', () => {
                 await removeK1Key(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     newK1Address,
                     wallet,
                 );
@@ -194,7 +205,7 @@ describe('Clave Contracts - Owner Manager tests', () => {
                 await addR1Key(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     newPublicKey,
                     wallet,
                 );
@@ -203,7 +214,7 @@ describe('Clave Contracts - Owner Manager tests', () => {
                 await addK1Key(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     newK1Address,
                     wallet,
                 );
@@ -223,7 +234,7 @@ describe('Clave Contracts - Owner Manager tests', () => {
                 await resetOwners(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     newPublicKey,
                     wallet,
                 );
@@ -232,6 +243,7 @@ describe('Clave Contracts - Owner Manager tests', () => {
                 const expectedNewR1Owners = [encodePublicKey(replacedKeyPair)];
                 const expectedNewK1Owners: Array<BytesLike> = [];
 
+                expect(await account.r1IsOwner(encodePublicKey(replacedKeyPair))).to.be.true;
                 expect(await account.r1ListOwners()).to.deep.eq(
                     expectedNewR1Owners,
                 );
@@ -284,6 +296,8 @@ describe('Clave Contracts - Owner Manager tests', () => {
                 const newKeyPair = genKey();
                 const newPublicKey = encodePublicKey(newKeyPair);
 
+                expect(await account.r1IsOwner(encodePublicKey(replacedKeyPair))).to.be.true;
+
                 await addR1Key(
                     provider,
                     account,

diff --git a/test/accounts/managers/upgrademanager.test.ts b/test/accounts/managers/upgrademanager.test.ts
@@ -20,7 +20,7 @@ describe('Clave Contracts - Upgrade Manager tests', () => {
     let deployer: ClaveDeployer;
     let provider: Provider;
     let richWallet: Wallet;
-    let teeValidator: Contract;
+    let eoaValidator: Contract;
     let account: Contract;
     let wallet: HDNodeWallet;
 
@@ -31,10 +31,10 @@ describe('Clave Contracts - Upgrade Manager tests', () => {
             cacheTimeout: -1,
         });
 
-        [, , , , teeValidator, account, wallet] = await fixture(
+        ({eoaValidator, account, wallet} = await fixture(
             deployer,
             VALIDATORS.EOA,
-        );
+        ));
 
         const accountAddress = await account.getAddress();
 
@@ -65,7 +65,7 @@ describe('Clave Contracts - Upgrade Manager tests', () => {
             await upgradeTx(
                 provider,
                 account,
-                teeValidator,
+                eoaValidator,
                 mockImplementation,
                 wallet,
             );
@@ -84,7 +84,7 @@ describe('Clave Contracts - Upgrade Manager tests', () => {
                 await upgradeTx(
                     provider,
                     account,
-                    teeValidator,
+                    eoaValidator,
                     mockImplementation,
                     wallet,
                 );