Fix test

Author: ScreamingHawk

packages/utils/migration/src/migrations/index.ts

@@ -2,7 +2,7 @@ import { State } from '@0xsequence/wallet-core'
 import { Payload } from '@0xsequence/wallet-primitives'
 import { Address, Hex } from 'ox'
 import { UnsignedMigration, VersionedContext } from '../types.js'
-import { MigrationEncoder_v1v3 } from './v1/migration_v1_v3.js'
+import { MigrationEncoder_v1v3 } from './v1/encoder_v1_v3.js'
 
 export interface MigrationEncoder<FromConfigType, ToConfigType, ConvertOptionsType, PrepareOptionsType> {
   fromVersion: number

…ion/src/migrations/v1/migration_v1_v3.ts …ation/src/migrations/v1/encoder_v1_v3.tspackages/utils/migration/src/migrations/v1/migration_v1_v3.ts renamed to packages/utils/migration/src/migrations/v1/encoder_v1_v3.ts packages/utils/migration/src/migrations/v1/migration_v1_v3.ts renamed to packages/utils/migration/src/migrations/v1/encoder_v1_v3.ts

@@ -4,7 +4,7 @@ import { State, Wallet as WalletV3 } from '@0xsequence/wallet-core'
 import { Payload, Context as V3Context } from '@0xsequence/wallet-primitives'
 import { Address, Hex } from 'ox'
 import { Migrator } from '../index.js'
-import { ConvertOptions, MigrationEncoder_v1v3, PrepareOptions } from './migration_v1_v3.js'
+import { ConvertOptions, MigrationEncoder_v1v3, PrepareOptions } from './encoder_v1_v3.js'
 
 export type MigratorV1V3Options = ConvertOptions &
   PrepareOptions & {

packages/utils/migration/src/migrations/v1/migrator_v1_v3.ts

@@ -13,7 +13,7 @@ import { ethers } from 'ethers'
 import { AbiFunction, Address, Hex, Provider, RpcTransport, Secp256k1 } from 'ox'
 import { fromRpcStatus } from 'ox/TransactionReceipt'
 import { assert, beforeEach, describe, expect, it } from 'vitest'
-import { MIGRATION_V1_V3_NONCE_SPACE, Migration_v1v3 } from '../src/migrations/v1/migration_v1_v3.js'
+import { MIGRATION_V1_V3_NONCE_SPACE, MigrationEncoder_v1v3 } from '../src/migrations/v1/encoder_v1_v3.js'
 import { VersionedContext } from '../src/types.js'
 import { createMultiSigner, MultiSigner } from './testUtils.js'
 
@@ -28,7 +28,7 @@ const convertContextToV3Context = (context: v2commons.context.WalletContext): V3
   }
 }
 
-describe('Migration_v1v3', () => {
+describe('MigrationEncoder_v1v3', () => {
   let anvilSigner: MultiSigner
   let testSigner: MultiSigner
 
@@ -38,12 +38,12 @@ describe('Migration_v1v3', () => {
   }
   let chainId: number
 
-  let migration: Migration_v1v3
+  let migration: MigrationEncoder_v1v3
 
   let testAddress: Address.Address
 
   beforeEach(async () => {
-    migration = new Migration_v1v3()
+    migration = new MigrationEncoder_v1v3()
     const url = 'http://127.0.0.1:8545'
     providers = {
       v2: ethers.getDefaultProvider(url),
@@ -546,6 +546,11 @@ describe('Migration_v1v3', () => {
             weight: 1,
             address: testSigner.address,
           },
+          // Include a random signer to avoid image hash collisions
+          {
+            weight: 1,
+            address: Address.fromPublicKey(Secp256k1.getPublicKey({ privateKey: Secp256k1.randomPrivateKey() })),
+          },
         ],
       }
       const v1ImageHash = v1.config.ConfigCoder.imageHashOf(v1Config)

…s/migration/test/migration_v1_v3.test.ts …ils/migration/test/encoder_v1_v3.test.tspackages/utils/migration/test/migration_v1_v3.test.ts renamed to packages/utils/migration/test/encoder_v1_v3.test.ts packages/utils/migration/test/migration_v1_v3.test.ts renamed to packages/utils/migration/test/encoder_v1_v3.test.ts

@@ -33,7 +33,8 @@ describe('Migrator_v1v3', () => {
     }
     chainId = Number(await providers.v3.request({ method: 'eth_chainId' }))
 
-    stateProvider = new State.Sequence.Provider('http://127.0.0.1:36261')
+    stateProvider = new State.Local.Provider()
+    // stateProvider = new State.Sequence.Provider('http://127.0.0.1:36261')
     migrator = new Migrator_v1v3(stateProvider)
 
     const anvilPk = '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
@@ -51,6 +52,11 @@ describe('Migrator_v1v3', () => {
             weight: 1,
             address: testSigner.address,
           },
+          // Include a random signer to avoid image hash collisions
+          {
+            weight: 1,
+            address: Address.fromPublicKey(Secp256k1.getPublicKey({ privateKey: Secp256k1.randomPrivateKey() })),
+          },
         ],
       }
       const orchestrator = new Orchestrator([testSigner.v2])