Update e2e tests to match new caveatBuilder interface

Author: jeffsmale90

packages/delegator-e2e/test/caveats/allowedCalldata.test.ts

@@ -1,13 +1,13 @@
 import { beforeEach, test, expect } from 'vitest';
 import {
-  createCaveatBuilder,
   createDelegation,
   createExecution,
   Implementation,
   toMetaMaskSmartAccount,
   type MetaMaskSmartAccount,
 } from '@metamask/delegation-toolkit';
 import {
+  createCaveatBuilder,
   encodeExecutionCalldatas,
   encodePermissionContexts,
   SINGLE_DEFAULT_MODE,
@@ -143,7 +143,10 @@ const runTest_expectSuccess = async (
     to: bobSmartAccount.address,
     from: aliceSmartAccount.address,
     caveats: caveats.reduce((builder, caveat) => {
-      builder.addCaveat('allowedCalldata', caveat.from, caveat.calldata);
+      builder.addCaveat('allowedCalldata', {
+        startIndex: caveat.from,
+        value: caveat.calldata,
+      });
       return builder;
     }, createCaveatBuilder(environment)),
   });
@@ -211,7 +214,10 @@ const runTest_expectFailure = async (
     to: bobSmartAccount.address,
     from: aliceSmartAccount.address,
     caveats: caveats.reduce((builder, caveat) => {
-      builder.addCaveat('allowedCalldata', caveat.from, caveat.calldata);
+      builder.addCaveat('allowedCalldata', {
+        startIndex: caveat.from,
+        value: caveat.calldata,
+      });
       return builder;
     }, createCaveatBuilder(aliceSmartAccount.environment)),
   });

packages/delegator-e2e/test/caveats/allowedMethods.test.ts

@@ -3,9 +3,9 @@ import {
   encodeExecutionCalldatas,
   encodePermissionContexts,
   SINGLE_DEFAULT_MODE,
+  createCaveatBuilder,
 } from '@metamask/delegation-toolkit/utils';
 import {
-  createCaveatBuilder,
   createExecution,
   createDelegation,
   Implementation,
@@ -140,7 +140,7 @@ const runTest_expectSuccess = async (
     from: aliceSmartAccount.address,
     caveats: createCaveatBuilder(aliceSmartAccount.environment).addCaveat(
       'allowedMethods',
-      allowedMethods,
+      { selectors: allowedMethods },
     ),
   });
 
@@ -206,7 +206,7 @@ const runTest_expectFailure = async (
     from: aliceSmartAccount.address,
     caveats: createCaveatBuilder(aliceSmartAccount.environment).addCaveat(
       'allowedMethods',
-      allowedMethods,
+      { selectors: allowedMethods },
     ),
   });
 

packages/delegator-e2e/test/caveats/allowedTargets.test.ts

@@ -3,9 +3,9 @@ import {
   encodeExecutionCalldatas,
   encodePermissionContexts,
   SINGLE_DEFAULT_MODE,
+  createCaveatBuilder,
 } from '@metamask/delegation-toolkit/utils';
 import {
-  createCaveatBuilder,
   createExecution,
   createDelegation,
   Implementation,
@@ -110,7 +110,7 @@ const runTest_expectSuccess = async (
     from: aliceSmartAccount.address,
     caveats: createCaveatBuilder(aliceSmartAccount.environment).addCaveat(
       'allowedTargets',
-      allowedTargets,
+      { targets: allowedTargets },
     ),
   });
 
@@ -176,7 +176,7 @@ const runTest_expectFailure = async (
     from: aliceSmartAccount.address,
     caveats: createCaveatBuilder(aliceSmartAccount.environment).addCaveat(
       'allowedTargets',
-      allowedTargets,
+      { targets: allowedTargets },
     ),
   });
 

packages/delegator-e2e/test/caveats/argsEqualityCheck.test.ts

@@ -3,9 +3,9 @@ import {
   encodeExecutionCalldatas,
   encodePermissionContexts,
   SINGLE_DEFAULT_MODE,
+  createCaveatBuilder,
 } from '@metamask/delegation-toolkit/utils';
 import {
-  createCaveatBuilder,
   createExecution,
   createDelegation,
   Implementation,
@@ -128,13 +128,13 @@ test('Bob attempts to redeem the delegation with args when none are expected', a
   );
 });
 
-const runTest_expectSuccess = async (expectedArgs: Hex, actualArgs: Hex) => {
+const runTest_expectSuccess = async (args: Hex, actualArgs: Hex) => {
   const delegation = createDelegation({
     to: bobSmartAccount.address,
     from: aliceSmartAccount.address,
     caveats: createCaveatBuilder(aliceSmartAccount.environment).addCaveat(
       'argsEqualityCheck',
-      expectedArgs,
+      { args },
     ),
   });
 
@@ -193,7 +193,7 @@ const runTest_expectSuccess = async (expectedArgs: Hex, actualArgs: Hex) => {
 };
 
 const runTest_expectFailure = async (
-  expectedArgs: Hex,
+  args: Hex,
   actualArgs: Hex,
   expectedError: string,
 ) => {
@@ -202,7 +202,7 @@ const runTest_expectFailure = async (
     from: aliceSmartAccount.address,
     caveats: createCaveatBuilder(aliceSmartAccount.environment).addCaveat(
       'argsEqualityCheck',
-      expectedArgs,
+      { args },
     ),
   });
 

packages/delegator-e2e/test/caveats/blockNumber.test.ts

@@ -3,9 +3,9 @@ import {
   encodeExecutionCalldatas,
   encodePermissionContexts,
   SINGLE_DEFAULT_MODE,
+  createCaveatBuilder,
 } from '@metamask/delegation-toolkit/utils';
 import {
-  createCaveatBuilder,
   createExecution,
   createDelegation,
   Implementation,
@@ -178,8 +178,10 @@ const runTest_expectSuccess = async (
     from: aliceSmartAccount.address,
     caveats: createCaveatBuilder(aliceSmartAccount.environment).addCaveat(
       'blockNumber',
-      afterThreshold,
-      beforeThreshold,
+      {
+        afterThreshold,
+        beforeThreshold,
+      },
     ),
   });
 
@@ -248,8 +250,10 @@ const runTest_expectFailure = async (
     from: aliceSmartAccount.address,
     caveats: createCaveatBuilder(aliceSmartAccount.environment).addCaveat(
       'blockNumber',
-      afterThreshold,
-      beforeThreshold,
+      {
+        afterThreshold,
+        beforeThreshold,
+      },
     ),
   });
 

packages/delegator-e2e/test/caveats/deployed.test.ts

@@ -3,9 +3,9 @@ import {
   encodeExecutionCalldatas,
   encodePermissionContexts,
   SINGLE_DEFAULT_MODE,
+  createCaveatBuilder,
 } from '@metamask/delegation-toolkit/utils';
 import {
-  createCaveatBuilder,
   createDelegation,
   createExecution,
   Implementation,
@@ -163,9 +163,11 @@ const runTest_expectSuccess = async (deployedAddress: Hex, salt: Hex) => {
     from: aliceSmartAccount.address,
     caveats: createCaveatBuilder(aliceSmartAccount.environment).addCaveat(
       'deployed',
-      deployedAddress,
-      salt,
-      CounterMetadata.bytecode.object as Hex,
+      {
+        contractAddress: deployedAddress,
+        salt,
+        bytecode: CounterMetadata.bytecode.object as Hex,
+      },
     ),
   });
 
@@ -244,9 +246,11 @@ const runTest_expectFailure = async (
     from: aliceSmartAccount.address,
     caveats: createCaveatBuilder(aliceSmartAccount.environment).addCaveat(
       'deployed',
-      deployedAddress,
-      salt,
-      CounterMetadata.bytecode.object as Hex,
+      {
+        contractAddress: deployedAddress,
+        salt,
+        bytecode: CounterMetadata.bytecode.object as Hex,
+      },
     ),
   });