chore: update conflict

Consensys · Apr 10, 2024 · 213b2e2 · 213b2e2
1 parent 065cc40
commit 213b2e2
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/packages/starknet-snap/test/constants.test.ts b/packages/starknet-snap/test/constants.test.ts
@@ -1,5 +1,5 @@
 import { JsonBIP44CoinTypeNode } from '@metamask/key-tree';
-import { num } from 'starknet';
+import { num, constants } from 'starknet';
 import {
   AccContract,
   Erc20Token,

diff --git a/packages/starknet-snap/test/src/declareContract.test.ts b/packages/starknet-snap/test/src/declareContract.test.ts
@@ -31,7 +31,7 @@ describe('Test function: declareContract', function () {
   };
 
   const requestObject: DeclareContractRequestParams = {
-    chainId: STARKNET_TESTNET_NETWORK.chainId,
+    chainId: STARKNET_SEPOLIA_TESTNET_NETWORK.chainId,
     senderAddress: account1.address,
     contractPayload: {
       contract: 'TestContract',
@@ -63,7 +63,7 @@ describe('Test function: declareContract', function () {
     const result = await declareContract(apiParams);
     const { privateKey } = await utils.getKeysFromAddress(
       apiParams.keyDeriver,
-      STARKNET_TESTNET_NETWORK,
+      STARKNET_SEPOLIA_TESTNET_NETWORK,
       state,
       account1.address,
     );
@@ -74,7 +74,7 @@ describe('Test function: declareContract', function () {
     });
     expect(declareContractStub).to.have.been.calledOnce;
     expect(declareContractStub).to.have.been.calledWith(
-      STARKNET_TESTNET_NETWORK,
+      STARKNET_SEPOLIA_TESTNET_NETWORK,
       account1.address,
       privateKey,
       { contract: 'TestContract' },
@@ -86,7 +86,7 @@ describe('Test function: declareContract', function () {
     const declareContractStub = sandbox.stub(utils, 'declareContract').rejects('error');
     const { privateKey } = await utils.getKeysFromAddress(
       apiParams.keyDeriver,
-      STARKNET_TESTNET_NETWORK,
+      STARKNET_SEPOLIA_TESTNET_NETWORK,
       state,
       account1.address,
     );
@@ -99,7 +99,7 @@ describe('Test function: declareContract', function () {
       expect(result).to.be.an('Error');
       expect(declareContractStub).to.have.been.calledOnce;
       expect(declareContractStub).to.have.been.calledWith(
-        STARKNET_TESTNET_NETWORK,
+        STARKNET_SEPOLIA_TESTNET_NETWORK,
         account1.address,
         privateKey,
         { contract: 'TestContract' },

diff --git a/packages/starknet-snap/test/src/extractPrivateKey.test.ts b/packages/starknet-snap/test/src/extractPrivateKey.test.ts
@@ -96,7 +96,7 @@ describe('Test function: extractPrivateKey', function () {
         } catch (err) {
           result = err;
         } finally {
-          expect(isUpgradeRequiredStub).to.have.been.calledOnceWith(STARKNET_TESTNET_NETWORK, account1.address);
+          expect(isUpgradeRequiredStub).to.have.been.calledOnceWith(STARKNET_SEPOLIA_TESTNET_NETWORK, account1.address);
           expect(result).to.be.an('Error');
         }
       });
@@ -115,7 +115,7 @@ describe('Test function: extractPrivateKey', function () {
         } catch (err) {
           result = err;
         } finally {
-          expect(isUpgradeRequiredStub).to.have.been.calledOnceWith(STARKNET_TESTNET_NETWORK, account1.address);
+          expect(isUpgradeRequiredStub).to.have.been.calledOnceWith(STARKNET_SEPOLIA_TESTNET_NETWORK, account1.address);
           expect(result).to.be.an('Error');
         }
       });

diff --git a/packages/starknet-snap/test/src/extractPublicKey.test.ts b/packages/starknet-snap/test/src/extractPublicKey.test.ts
@@ -95,7 +95,7 @@ describe('Test function: extractPublicKey', function () {
         } catch (err) {
           result = err;
         } finally {
-          expect(isUpgradeRequiredStub).to.have.been.calledOnceWith(STARKNET_TESTNET_NETWORK, account1.address);
+          expect(isUpgradeRequiredStub).to.have.been.calledOnceWith(STARKNET_SEPOLIA_TESTNET_NETWORK, account1.address);
           expect(result).to.be.an('Error');
         }
       });
@@ -114,7 +114,7 @@ describe('Test function: extractPublicKey', function () {
         } catch (err) {
           result = err;
         } finally {
-          expect(isUpgradeRequiredStub).to.have.been.calledOnceWith(STARKNET_TESTNET_NETWORK, account1.address);
+          expect(isUpgradeRequiredStub).to.have.been.calledOnceWith(STARKNET_SEPOLIA_TESTNET_NETWORK, account1.address);
           expect(result).to.be.an('Error');
         }
       });

diff --git a/packages/starknet-snap/test/src/signDeclareTransaction.test.ts b/packages/starknet-snap/test/src/signDeclareTransaction.test.ts
@@ -32,7 +32,7 @@ describe('Test function: signDeclareTransaction', function () {
   };
 
   const requestObject: SignDeclareTransactionRequestParams = {
-    chainId: STARKNET_TESTNET_NETWORK.chainId,
+    chainId: STARKNET_SEPOLIA_TESTNET_NETWORK.chainId,
     signerAddress: account1.address,
     transaction: {
       classHash: '0x025ec026985a3bf9d0cc1fe17326b245dfdc3ff89b8fde106542a3ea56c5a918',

diff --git a/packages/starknet-snap/test/src/signDeployAccountTransaction.test.ts b/packages/starknet-snap/test/src/signDeployAccountTransaction.test.ts
@@ -32,7 +32,7 @@ describe('Test function: signDeployAccountTransaction', function () {
   };
 
   const requestObject: SignDeployAccountTransactionRequestParams = {
-    chainId: STARKNET_TESTNET_NETWORK.chainId,
+    chainId: STARKNET_SEPOLIA_TESTNET_NETWORK.chainId,
     signerAddress: account1.address,
     transaction: {
       classHash: '0x025ec026985a3bf9d0cc1fe17326b245dfdc3ff89b8fde106542a3ea56c5a918',

diff --git a/packages/starknet-snap/test/src/signTransaction.test.ts b/packages/starknet-snap/test/src/signTransaction.test.ts
@@ -32,7 +32,7 @@ describe('Test function: signMessage', function () {
   };
 
   const requestObject: SignTransactionRequestParams = {
-    chainId: STARKNET_TESTNET_NETWORK.chainId,
+    chainId: STARKNET_SEPOLIA_TESTNET_NETWORK.chainId,
     signerAddress: account1.address,
     transactions: [
       {

diff --git a/packages/starknet-snap/test/src/upgradeAccContract.test.ts b/packages/starknet-snap/test/src/upgradeAccContract.test.ts
@@ -7,7 +7,7 @@ import * as utils from '../../src/utils/starknetUtils';
 import * as snapUtils from '../../src/utils/snapUtils';
 import { SnapState, VoyagerTransactionType, TransactionStatus } from '../../src/types/snapState';
 import { upgradeAccContract } from '../../src/upgradeAccContract';
-import { STARKNET_TESTNET_NETWORK } from '../../src/utils/constants';
+import { STARKNET_SEPOLIA_TESTNET_NETWORK } from '../../src/utils/constants';
 import { account1, estimateFeeResp, getBip44EntropyStub, sendTransactionResp } from '../constants.test';
 import { getAddressKeyDeriver } from '../../src/utils/keyPair';
 import { Mutex } from 'async-mutex';
@@ -28,7 +28,7 @@ describe('Test function: upgradeAccContract', function () {
   beforeEach(async function () {
     const requestObject = {
       contractAddress: account1.address,
-      chainId: STARKNET_TESTNET_NETWORK.chainId,
+      chainId: STARKNET_SEPOLIA_TESTNET_NETWORK.chainId,
     };
 
     walletStub = new WalletMock();
@@ -37,7 +37,7 @@ describe('Test function: upgradeAccContract', function () {
     state = {
       accContracts: [account1],
       erc20Tokens: [],
-      networks: [STARKNET_TESTNET_NETWORK],
+      networks: [STARKNET_SEPOLIA_TESTNET_NETWORK],
       transactions: [],
     };
 
@@ -154,7 +154,7 @@ describe('Test function: upgradeAccContract', function () {
 
       expect(executeTxnStub).to.calledOnce;
       expect(executeTxnStub).to.calledWith(
-        STARKNET_TESTNET_NETWORK,
+        STARKNET_SEPOLIA_TESTNET_NETWORK,
         address,
         'pk',
         txnInvocation,
@@ -188,7 +188,7 @@ describe('Test function: upgradeAccContract', function () {
 
       expect(executeTxnStub).to.calledOnce;
       expect(executeTxnStub).to.calledWith(
-        STARKNET_TESTNET_NETWORK,
+        STARKNET_SEPOLIA_TESTNET_NETWORK,
         address,
         'pk',
         txnInvocation,
@@ -265,7 +265,7 @@ describe('Test function: upgradeAccContract', function () {
       const txn = {
         txnHash: sendTransactionResp.transaction_hash,
         txnType: VoyagerTransactionType.INVOKE,
-        chainId: STARKNET_TESTNET_NETWORK.chainId,
+        chainId: STARKNET_SEPOLIA_TESTNET_NETWORK.chainId,
         senderAddress: address,
         contractAddress: address,
         contractFuncName: 'upgrade',