simplify how env is loaded

OffchainLabs · Dec 12, 2024 · c58abd3 · c58abd3
1 parent 9030353
commit c58abd3
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 20 deletions.
diff --git a/packages/sdk/scripts/deployStandard.ts b/packages/sdk/scripts/deployStandard.ts
@@ -1,12 +1,12 @@
 import { instantiateBridge } from './instantiate_bridge'
-import * as dotenv from 'dotenv'
+import { loadEnv } from '../src/lib/utils/env'
 import args from './getCLargs'
 import { constants, BigNumber, utils } from 'ethers'
 import { MultiCaller } from '../src'
 import axios from 'axios'
 import prompt from 'prompts'
-import * as path from 'path'
-dotenv.config({ path: path.resolve(__dirname, '../../../.env') })
+
+loadEnv()
 
 const privKey = process.env.PRIVKEY as string
 if (!privKey) {

diff --git a/packages/sdk/scripts/genNetwork.ts b/packages/sdk/scripts/genNetwork.ts
@@ -1,6 +1,4 @@
-import * as dotenv from 'dotenv'
-import * as path from 'path'
-dotenv.config({ path: path.resolve(__dirname, '../../../.env') })
+import { loadEnv } from '../src/lib/utils/env'
 import { execSync } from 'child_process'
 import * as fs from 'fs'
 
@@ -12,6 +10,8 @@ import {
   mapL2NetworkToArbitrumNetwork,
 } from '../src/lib/dataEntities/networks'
 
+loadEnv()
+
 const isTestingOrbitChains = process.env.ORBIT_TEST === '1'
 
 function getLocalNetworksFromContainer(which: 'l1l2' | 'l2l3'): any {

diff --git a/packages/sdk/scripts/instantiate_bridge.ts b/packages/sdk/scripts/instantiate_bridge.ts
@@ -18,8 +18,8 @@
 
 import { JsonRpcProvider } from '@ethersproject/providers'
 import { Wallet } from '@ethersproject/wallet'
+import { loadEnv } from '../src/lib/utils/env'
 
-import * as dotenv from 'dotenv'
 import args from './getCLargs'
 import { EthBridger, InboxTools, Erc20Bridger } from '../src'
 import {
@@ -29,7 +29,7 @@ import {
 import { Signer } from 'ethers'
 import { AdminErc20Bridger } from '../src/lib/assetBridger/erc20Bridger'
 
-dotenv.config({ path: path.resolve(__dirname, '../../../.env') })
+loadEnv()
 
 const arbKey = process.env['ARB_KEY'] as string
 const ethKey = process.env['ETH_KEY'] as string

diff --git a/packages/sdk/scripts/testSetup.ts b/packages/sdk/scripts/testSetup.ts
@@ -19,7 +19,7 @@
 import { JsonRpcProvider } from '@ethersproject/providers'
 import { Wallet } from '@ethersproject/wallet'
 import { Provider } from '@ethersproject/abstract-provider'
-import * as dotenv from 'dotenv'
+import { loadEnv } from '../src/lib/utils/env'
 
 import { EthBridger, InboxTools, Erc20Bridger } from '../src'
 import {
@@ -41,7 +41,7 @@ import {
 } from '../tests/integration/custom-fee-token/customFeeTokenTestHelpers'
 import { fundParentSigner } from '../tests/integration/testHelpers'
 
-dotenv.config({ path: path.resolve(__dirname, '../../../.env') })
+loadEnv()
 
 const isTestingOrbitChains = process.env.ORBIT_TEST === '1'
 

diff --git a/packages/sdk/src/lib/utils/env.ts b/packages/sdk/src/lib/utils/env.ts
@@ -0,0 +1,6 @@
+import * as dotenv from 'dotenv'
+import * as path from 'path'
+
+export const loadEnv = () => {
+  dotenv.config({ path: path.resolve(__dirname, '../../../.env') })
+}
diff --git a/packages/sdk/tests/integration/custom-fee-token/customFeeTokenEthBridger.test.ts b/packages/sdk/tests/integration/custom-fee-token/customFeeTokenEthBridger.test.ts
@@ -18,8 +18,7 @@
 
 import { expect } from 'chai'
 import { ethers, constants, Wallet } from 'ethers'
-import * as dotenv from 'dotenv'
-import * as path from 'path'
+import { loadEnv } from '../../../src/lib/utils/env'
 
 import { parseEther, parseUnits } from '@ethersproject/units'
 
@@ -35,7 +34,7 @@ import { ChildToParentMessageStatus } from '../../../src'
 import { ChildToParentMessage } from '../../../src/lib/message/ChildToParentMessage'
 import { getNativeTokenDecimals } from '../../../src/lib/utils/lib'
 
-dotenv.config({ path: path.resolve(__dirname, '../../../../.env') })
+loadEnv()
 
 describeOnlyWhenCustomGasToken(
   'EthBridger (with custom fee token)',

diff --git a/packages/sdk/tests/integration/eth.test.ts b/packages/sdk/tests/integration/eth.test.ts
@@ -17,9 +17,7 @@
 'use strict'
 
 import { expect } from 'chai'
-import * as dotenv from 'dotenv'
-import * as path from 'path'
-
+import { loadEnv } from '../../src/lib/utils/env'
 import { Wallet } from '@ethersproject/wallet'
 import { parseEther } from '@ethersproject/units'
 import { constants } from 'ethers'
@@ -45,7 +43,7 @@ import {
 } from '../../src/lib/utils/lib'
 import { parseUnits } from 'ethers/lib/utils'
 
-dotenv.config({ path: path.resolve(__dirname, '../../../.env') })
+loadEnv()
 
 describe('Ether', async () => {
   beforeEach('skipIfMainnet', async function () {

diff --git a/packages/sdk/tests/integration/getArbitrumNetworkInformationFromRollup.test.ts b/packages/sdk/tests/integration/getArbitrumNetworkInformationFromRollup.test.ts
@@ -1,15 +1,14 @@
-import * as path from 'path'
-import * as dotenv from 'dotenv'
 import { JsonRpcProvider } from '@ethersproject/providers'
 import { constants } from 'ethers'
 import { expect } from 'chai'
+import { loadEnv } from '../../src/lib/utils/env'
 
 import {
   getArbitrumNetwork,
   getArbitrumNetworkInformationFromRollup,
 } from '../../src/lib/dataEntities/networks'
 
-dotenv.config({ path: path.resolve(__dirname, '../../../.env') })
+loadEnv()
 
 describe('getArbitrumNetworkInformationFromRollup', () => {
   it('fetches information about arbitrum one', async () => {