Support signers and providers in tests

safe-global · Sep 16, 2022 · 4288a66 · 4288a66
1 parent 71b73d7
commit 4288a66
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/packages/safe-core-sdk/tests/utils/setupEthAdapter.ts b/packages/safe-core-sdk/tests/utils/setupEthAdapter.ts
@@ -1,19 +1,22 @@
 import { Signer } from '@ethersproject/abstract-signer'
+import { Provider } from '@ethersproject/providers'
 import { EthAdapter } from '@gnosis.pm/safe-core-sdk-types'
 import EthersAdapter, { EthersAdapterConfig } from '@gnosis.pm/safe-ethers-lib'
 import Web3Adapter, { Web3AdapterConfig } from '@gnosis.pm/safe-web3-lib'
 import { ethers, web3 } from 'hardhat'
 
-export async function getEthAdapter(signer: Signer): Promise<EthAdapter> {
+export async function getEthAdapter(signerOrProvider: Signer | Provider): Promise<EthAdapter> {
   let ethAdapter: EthAdapter
   switch (process.env.ETH_LIB) {
     case 'web3':
-      const signerAddress = await signer.getAddress()
+      const signerAddress = (signerOrProvider instanceof Signer)
+        ? await signerOrProvider.getAddress()
+        : undefined
       const web3AdapterConfig: Web3AdapterConfig = { web3: web3 as any, signerAddress }
       ethAdapter = new Web3Adapter(web3AdapterConfig)
       break
     case 'ethers':
-      const ethersAdapterConfig: EthersAdapterConfig = { ethers, signer }
+      const ethersAdapterConfig: EthersAdapterConfig = { ethers, signerOrProvider }
       ethAdapter = new EthersAdapter(ethersAdapterConfig)
       break
     default:

diff --git a/packages/safe-service-client/tests/utils/setupEthAdapter.ts b/packages/safe-service-client/tests/utils/setupEthAdapter.ts
@@ -1,19 +1,22 @@
 import { Signer } from '@ethersproject/abstract-signer'
+import { Provider } from '@ethersproject/providers'
 import { EthAdapter } from '@gnosis.pm/safe-core-sdk-types'
 import EthersAdapter, { EthersAdapterConfig } from '@gnosis.pm/safe-ethers-lib'
 import Web3Adapter, { Web3AdapterConfig } from '@gnosis.pm/safe-web3-lib'
 import { ethers, web3 } from 'hardhat'
 
-export async function getEthAdapter(signer: Signer): Promise<EthAdapter> {
+export async function getEthAdapter(signerOrProvider: Signer | Provider): Promise<EthAdapter> {
   let ethAdapter: EthAdapter
   switch (process.env.ETH_LIB) {
     case 'web3':
-      const signerAddress = await signer.getAddress()
+      const signerAddress = (signerOrProvider instanceof Signer)
+        ? await signerOrProvider.getAddress()
+        : undefined
       const web3AdapterConfig: Web3AdapterConfig = { web3: web3 as any, signerAddress }
       ethAdapter = new Web3Adapter(web3AdapterConfig)
       break
     case 'ethers':
-      const ethersAdapterConfig: EthersAdapterConfig = { ethers, signer }
+      const ethersAdapterConfig: EthersAdapterConfig = { ethers, signerOrProvider }
       ethAdapter = new EthersAdapter(ethersAdapterConfig)
       break
     default: