clean up

OffchainLabs · Nov 18, 2024 · fe1b33c · fe1b33c
1 parent f7067c2
commit fe1b33c
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 162 deletions.
diff --git a/src/experimental/arbitrumDeposit/actions.ts → src/experimental/actions.ts b/src/experimental/arbitrumDeposit/actions.ts → src/experimental/actions.ts
@@ -6,7 +6,7 @@ import {
   type PublicClient,
   TransactionRequest,
 } from 'viem'
-import { EthBridger } from '../../lib/assetBridger/ethBridger'
+import { EthBridger } from '../lib/assetBridger/ethBridger'
 import { transformPublicClientToProvider } from './transformViemToEthers'
 
 export type PrepareDepositEthParameters = {

diff --git a/src/experimental/arbitrumDeposit/abis/inbox.ts b/src/experimental/arbitrumDeposit/abis/inbox.ts
diff --git a/src/experimental/arbitrumDeposit/abis/l1GatewayRouter.ts b/src/experimental/arbitrumDeposit/abis/l1GatewayRouter.ts
diff --git a/src/experimental/arbitrumDeposit/types.ts b/src/experimental/arbitrumDeposit/types.ts
diff --git a/...l/arbitrumDeposit/createArbitrumClient.ts → src/experimental/createArbitrumClient.ts b/...l/arbitrumDeposit/createArbitrumClient.ts → src/experimental/createArbitrumClient.ts
@@ -1,13 +1,12 @@
 import { Chain, PublicClient, createPublicClient, http } from 'viem'
-import { ArbitrumNetwork } from '../../lib/dataEntities/networks'
+import { ArbitrumNetwork } from '../lib/dataEntities/networks'
 import { arbitrumDepositActions } from './actions'
 
 export type ArbitrumChain = Chain & ArbitrumNetwork
 
 export type ArbitrumClients = {
-  parentChainPublicClient: PublicClient
-  childChainPublicClient: PublicClient &
-    ReturnType<typeof arbitrumDepositActions>
+  parentPublicClient: PublicClient
+  childPublicClient: PublicClient & ReturnType<typeof arbitrumDepositActions>
 }
 export type ChildChainPublicClient = PublicClient &
   ReturnType<typeof arbitrumDepositActions>
@@ -25,18 +24,18 @@ export function createArbitrumClient({
   parentRpcUrl,
   childRpcUrl,
 }: CreateArbitrumClientParams): ArbitrumClients {
-  const parentChainPublicClient = createPublicClient({
+  const parentPublicClient = createPublicClient({
     chain: parentChain,
     transport: http(parentRpcUrl || parentChain.rpcUrls.default.http[0]),
   })
 
-  const childChainPublicClient = createPublicClient({
+  const childPublicClient = createPublicClient({
     chain: childChain,
     transport: http(childRpcUrl || childChain.rpcUrls.default.http[0]),
   }).extend(arbitrumDepositActions())
 
   return {
-    parentChainPublicClient,
-    childChainPublicClient,
+    parentPublicClient,
+    childPublicClient,
   } as any as ArbitrumClients
 }
diff --git a/.../arbitrumDeposit/transformViemToEthers.ts → src/experimental/transformViemToEthers.ts b/.../arbitrumDeposit/transformViemToEthers.ts → src/experimental/transformViemToEthers.ts
diff --git a/tests/integration/arbitrumDeposit.test.ts → ...ntegration/arbitrumDepositActions.test.ts b/tests/integration/arbitrumDeposit.test.ts → ...ntegration/arbitrumDepositActions.test.ts
@@ -3,7 +3,7 @@ import { createWalletClient, http, parseEther } from 'viem'
 import { privateKeyToAccount } from 'viem/accounts'
 import { config, testSetup } from '../../scripts/testSetup'
 import { localEthChain, localArbChain } from '../../src/experimental/chains'
-import { createArbitrumClient } from '../../src/experimental/arbitrumDeposit/createArbitrumClient'
+import { createArbitrumClient } from '../../src/experimental/createArbitrumClient'
 
 describe('arbitrumDepositActions', function () {
   before(async function () {
@@ -22,23 +22,22 @@ describe('arbitrumDepositActions', function () {
     })
 
     // Create public clients using helper
-    const { parentChainPublicClient, childChainPublicClient } =
-      createArbitrumClient({
-        parentChain: localEthChain,
-        // @ts-expect-error
-        childChain: localArbChain,
-        parentRpcUrl: config.ethUrl,
-        childRpcUrl: config.arbUrl,
-      })
+    const { parentPublicClient, childPublicClient } = createArbitrumClient({
+      parentChain: localEthChain,
+      // @ts-expect-error
+      childChain: localArbChain,
+      parentRpcUrl: config.ethUrl,
+      childRpcUrl: config.arbUrl,
+    })
 
     // Get initial L2 balance
-    const initialBalance = await childChainPublicClient.getBalance({
+    const initialBalance = await childPublicClient.getBalance({
       address: account.address,
     })
 
     // Prepare and send deposit transaction
     // @ts-expect-error
-    const request = await childChainPublicClient.prepareDepositEthTransaction({
+    const request = await childPublicClient.prepareDepositEthTransaction({
       amount: depositAmount,
       account,
     })
@@ -49,7 +48,7 @@ describe('arbitrumDepositActions', function () {
     })
 
     // Wait for L1 transaction
-    const receipt = await parentChainPublicClient.waitForTransactionReceipt({
+    const receipt = await parentPublicClient.waitForTransactionReceipt({
       hash,
     })
 
@@ -63,7 +62,7 @@ describe('arbitrumDepositActions', function () {
     while (attempts < maxAttempts) {
       await new Promise(resolve => setTimeout(resolve, 3000))
 
-      const currentBalance = await childChainPublicClient.getBalance({
+      const currentBalance = await childPublicClient.getBalance({
         address: account.address,
       })
 
@@ -93,38 +92,35 @@ describe('arbitrumDepositActions', function () {
     })
 
     // Create public clients using helper
-    const { parentChainPublicClient, childChainPublicClient } =
-      createArbitrumClient({
-        parentChain: localEthChain,
-        // @ts-expect-error
-        childChain: localArbChain,
-        parentRpcUrl: config.ethUrl,
-        childRpcUrl: config.arbUrl,
-      })
+    const { parentPublicClient, childPublicClient } = createArbitrumClient({
+      parentChain: localEthChain,
+      // @ts-expect-error
+      childChain: localArbChain,
+      parentRpcUrl: config.ethUrl,
+      childRpcUrl: config.arbUrl,
+    })
 
     // Get initial destination balance
-    const initialBalance = await childChainPublicClient.getBalance({
+    const initialBalance = await childPublicClient.getBalance({
       address: destinationAddress,
     })
 
     // Prepare and send deposit transaction
     // @ts-expect-error
-    const request = await childChainPublicClient.prepareDepositEthToTransaction(
-      {
-        amount: depositAmount,
-        account: account.address,
-        destinationAddress,
-        parentPublicClient: parentChainPublicClient,
-      }
-    )
+    const request = await childPublicClient.prepareDepositEthToTransaction({
+      amount: depositAmount,
+      account: account.address,
+      destinationAddress,
+      parentPublicClient,
+    })
 
     const hash = await parentWalletClient.sendTransaction({
       ...request,
       chain: localEthChain,
     })
 
     // Wait for L1 transaction
-    const receipt = await parentChainPublicClient.waitForTransactionReceipt({
+    const receipt = await parentPublicClient.waitForTransactionReceipt({
       hash,
     })
 
@@ -138,7 +134,7 @@ describe('arbitrumDepositActions', function () {
     while (attempts < maxAttempts) {
       await new Promise(resolve => setTimeout(resolve, 3000))
 
-      const currentBalance = await childChainPublicClient.getBalance({
+      const currentBalance = await childPublicClient.getBalance({
         address: destinationAddress,
       })