Merge remote-tracking branch 'origin/alpha' into update-auth-ap-paths

MoralisWeb3 · Jul 25, 2022 · 9a0e9eb · 9a0e9eb
2 parents b7e16b0 + 61b8759
commit 9a0e9eb
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 20 deletions.
diff --git a/packages/evmUtils/src/config/EvmUtilsConfigSetup.ts b/packages/evmUtils/src/config/EvmUtilsConfigSetup.ts
@@ -3,12 +3,7 @@ import { EvmUtilsConfig } from './EvmUtilsConfig';
 
 export class EvmUtilsConfigSetup {
   public static register(config: Config) {
-    if (!config.hasKey(EvmUtilsConfig.formatEvmAddress)) {
-      config.registerKey(EvmUtilsConfig.formatEvmAddress);
-    }
-
-    if (!config.hasKey(EvmUtilsConfig.formatEvmChainId)) {
-      config.registerKey(EvmUtilsConfig.formatEvmChainId);
-    }
+    config.registerKey(EvmUtilsConfig.formatEvmAddress);
+    config.registerKey(EvmUtilsConfig.formatEvmChainId);
   }
 }
diff --git a/packages/evmUtils/src/dataTypes/EvmAddress/EvmAddress.test.ts b/packages/evmUtils/src/dataTypes/EvmAddress/EvmAddress.test.ts
@@ -1,6 +1,6 @@
 import { MoralisCore } from '@moralisweb3/core';
 import { EvmAddress } from './EvmAddress';
-import { setupEvm } from '../../test/setup';
+import { setupEvmUtils } from '../../test/setup';
 
 const TEST_ADDRESS_CHECKSUM = '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045';
 const TEST_ADDRESS_CHECKSUM2 = '0x766fd99F7D249E275b4CF9baE422D50cC3223869';
@@ -11,7 +11,7 @@ describe('EvmAddress', () => {
   let core: MoralisCore;
 
   beforeAll(() => {
-    core = setupEvm();
+    core = setupEvmUtils();
   });
 
   beforeEach(() => {

diff --git a/packages/evmUtils/src/dataTypes/EvmChain/EvmChain.test.ts b/packages/evmUtils/src/dataTypes/EvmChain/EvmChain.test.ts
@@ -1,12 +1,12 @@
 import { MoralisCore } from '@moralisweb3/core';
-import { setupEvm } from '../../test/setup';
+import { setupEvmUtils } from '../../test/setup';
 import { EvmChain } from './EvmChain';
 
 describe('EvmChain', () => {
   let core: MoralisCore;
 
   beforeAll(() => {
-    core = setupEvm();
+    core = setupEvmUtils();
   });
 
   beforeEach(() => {

diff --git a/packages/evmUtils/src/dataTypes/EvmNative/EvmNative.test.ts b/packages/evmUtils/src/dataTypes/EvmNative/EvmNative.test.ts
@@ -1,9 +1,9 @@
-import { setupEvm } from '../../test/setup';
+import { setupEvmUtils } from '../../test/setup';
 import { EvmNative, EvmNativeUnit } from './EvmNative';
 
 describe('EvmNative', () => {
   beforeAll(() => {
-    setupEvm();
+    setupEvmUtils();
   });
 
   function testUnit(unit: EvmNativeUnit, wei: string, gwei: string, ether: string) {

diff --git a/packages/evmUtils/src/dataTypes/EvmTransaction/EvmTransaction.test.ts b/packages/evmUtils/src/dataTypes/EvmTransaction/EvmTransaction.test.ts
@@ -1,7 +1,7 @@
 import { EvmTransaction } from './EvmTransaction';
 import { EvmTransactionInput } from './EvmTransactionTypes';
 import { EvmTransactionResponse } from '../EvmTransactionResponse';
-import { setupEvm } from '../../test/setup';
+import { setupEvmUtils } from '../../test/setup';
 
 const DATA =
   '0x00000000000000000000000000000000000000000000213ba4fc56e2e24648b200000000000000000000000000000000000000000000002e9e527eb8ff21faf7';
@@ -25,7 +25,7 @@ const inputWithAllData: EvmTransactionInput = {
 
 describe('EvmTransaction', () => {
   beforeAll(() => {
-    setupEvm();
+    setupEvmUtils();
   });
 
   /**

diff --git a/packages/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.test.ts b/packages/evmUtils/src/dataTypes/EvmTransactionLog/EvmTransactionLog.test.ts
@@ -1,4 +1,4 @@
-import { setupEvm } from '../../test/setup';
+import { setupEvmUtils } from '../../test/setup';
 import { EvmTransactionLog } from './EvmTransactionLog';
 
 // Set variables
@@ -50,7 +50,7 @@ const inputWithInvalidData = {
 
 describe('EvmTransactionLog', () => {
   beforeAll(() => {
-    setupEvm();
+    setupEvmUtils();
   });
 
   /**

diff --git a/packages/evmUtils/src/dataTypes/EvmTransactionReceipt/EvmTransactionReceipt.test.ts b/packages/evmUtils/src/dataTypes/EvmTransactionReceipt/EvmTransactionReceipt.test.ts
@@ -1,5 +1,5 @@
 import { BigNumber } from '@ethersproject/bignumber';
-import { setupEvm } from '../../test/setup';
+import { setupEvmUtils } from '../../test/setup';
 import { EvmTransactionLogInput } from '../EvmTransactionLog';
 import { EvmTransactionResponse, EvmTransactionResponseInput } from '../EvmTransactionResponse';
 import { EvmTransactionReceipt } from './EvmTransactionReceipt';
@@ -87,7 +87,7 @@ const expectedTotalGas = BigNumber.from(inputWithAllData.cumulativeGasUsed).mul(
 
 describe('EvmTransactionReceipt', () => {
   beforeAll(() => {
-    setupEvm();
+    setupEvmUtils();
   });
 
   /**

diff --git a/packages/evmUtils/src/test/setup.ts b/packages/evmUtils/src/test/setup.ts
@@ -1,7 +1,7 @@
 import { MoralisCoreProvider } from '@moralisweb3/core';
 import { MoralisEvmUtils } from '../MoralisEvmUtils';
 
-export const setupEvm = () => {
+export const setupEvmUtils = () => {
   const core = MoralisCoreProvider.getDefault();
   const evmUtils = MoralisEvmUtils.create();