diff --git a/test/bundler-integration/module/AccountRecovery.Module.specs.ts b/test/bundler-integration/module/AccountRecovery.Module.specs.ts index 7d1c116c..f94d9228 100644 --- a/test/bundler-integration/module/AccountRecovery.Module.specs.ts +++ b/test/bundler-integration/module/AccountRecovery.Module.specs.ts @@ -9,7 +9,6 @@ import { getMockToken, getEcdsaOwnershipRegistryModule, getSmartAccountWithModule, - getVerifyingPaymaster, } from "../../utils/setupHelper"; import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers"; import { BundlerTestEnvironment } from "../environment/bundlerEnvironment"; @@ -156,10 +155,6 @@ describe("Account Recovery Module (via Bundler)", async () => { ecdsaModule: ecdsaModule, userSA: userSA, accountRecoveryModule: accountRecoveryModule, - verifyingPaymaster: await getVerifyingPaymaster( - deployer, - verifiedSigner - ), defaultSecurityDelay: defaultSecurityDelay, controlMessage: controlMessage, }; diff --git a/test/module/AccountRecovery.Module.specs.ts b/test/module/AccountRecovery.Module.specs.ts index 675d12ae..d4a1457f 100644 --- a/test/module/AccountRecovery.Module.specs.ts +++ b/test/module/AccountRecovery.Module.specs.ts @@ -7,7 +7,6 @@ import { getMockToken, getEcdsaOwnershipRegistryModule, getSmartAccountWithModule, - getVerifyingPaymaster, } from "../utils/setupHelper"; import { makeEcdsaModuleUserOp, @@ -149,10 +148,6 @@ describe("Account Recovery Module: ", async () => { userSA: userSA, aliceSA: aliceSA, accountRecoveryModule: accountRecoveryModule, - verifyingPaymaster: await getVerifyingPaymaster( - deployer, - verifiedSigner - ), defaultSecurityDelay: defaultSecurityDelay, controlMessage: controlMessage, chainId: chainId, diff --git a/test/utils/accountRecovery.ts b/test/utils/accountRecovery.ts index abd204cc..c59f6ba7 100644 --- a/test/utils/accountRecovery.ts +++ b/test/utils/accountRecovery.ts @@ -1,21 +1,14 @@ -import { BigNumber, BytesLike, Contract, Signer } from "ethers"; +import { Contract, Signer } from "ethers"; import { ethers } from "hardhat"; -import { EntryPoint, SmartAccount } from "../../typechain"; +import { EntryPoint } from "../../typechain-types"; import { UserOperation } from "./userOperation"; import { - fillAndSign, - makeEcdsaModuleUserOp, getUserOpHash, fillUserOp, } from "./userOp"; import { - hexZeroPad, - hexConcat, - defaultAbiCoder, arrayify, } from "ethers/lib/utils"; -import MerkleTree from "merkletreejs"; -import { keccak256 } from "ethereumjs-util"; export async function makeMultiSignedUserOpWithGuardiansList( functionName: string,