fixes after merge

multiversx · Oct 21, 2024 · 77d925c · 77d925c
1 parent b181d47
commit 77d925c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/integrationTests/chainSimulator/bridge/common.go b/integrationTests/chainSimulator/bridge/common.go
@@ -124,9 +124,10 @@ func esdtSafeContract(
 	nonce *uint64,
 	systemContractDeploy []byte,
 	_ ArgsEsdtSafe,
+	contractWasmPath string,
 ) []byte {
 	esdtSafeArgs := "@" // is_sovereign_chain
-	return chainSim.DeployContract(t, cs, ownerAddress, nonce, systemContractDeploy, esdtSafeArgs, esdtSafeWasmPath)
+	return chainSim.DeployContract(t, cs, ownerAddress, nonce, systemContractDeploy, esdtSafeArgs, contractWasmPath)
 }
 
 func enshrineEsdtSafeContract(

diff --git a/integrationTests/chainSimulator/bridge/esdtSafe_test.go b/integrationTests/chainSimulator/bridge/esdtSafe_test.go
@@ -65,7 +65,7 @@ func TestChainSimulator_ExecuteAndDepositTokensWithPrefix(t *testing.T) {
 	// deploy bridge setup
 	initialAddress := "erd1l6xt0rqlyzw56a3k8xwwshq2dcjwy3q9cppucvqsmdyw8r98dz3sae0kxl"
 	chainSim.InitAddressesAndSysAccState(t, cs, initialAddress)
-	bridgeData := deployBridgeSetup(t, cs, initialAddress, ArgsEsdtSafe{}, esdtSafeContract)
+	bridgeData := deployBridgeSetup(t, cs, initialAddress, ArgsEsdtSafe{}, esdtSafeContract, esdtSafeWasmPath)
 	esdtSafeAddr, _ := cs.GetNodeHandler(0).GetCoreComponents().AddressPubKeyConverter().Encode(bridgeData.ESDTSafeAddress)
 	esdtSafeAddrShard := chainSim.GetShardForAddress(cs, esdtSafeAddr)
 
@@ -273,7 +273,7 @@ func TestChainSimulator_DepositAndExecuteOperations(t *testing.T) {
 	// deploy bridge setup
 	initialAddress := "erd1l6xt0rqlyzw56a3k8xwwshq2dcjwy3q9cppucvqsmdyw8r98dz3sae0kxl"
 	chainSim.InitAddressesAndSysAccState(t, cs, initialAddress)
-	bridgeData := deployBridgeSetup(t, cs, initialAddress, ArgsEsdtSafe{}, esdtSafeContract)
+	bridgeData := deployBridgeSetup(t, cs, initialAddress, ArgsEsdtSafe{}, esdtSafeContract, esdtSafeWasmPath)
 	esdtSafeAddr, _ := cs.GetNodeHandler(0).GetCoreComponents().AddressPubKeyConverter().Encode(bridgeData.ESDTSafeAddress)
 	esdtSafeAddrShard := chainSim.GetShardForAddress(cs, esdtSafeAddr)
 
@@ -340,7 +340,7 @@ func generateAccountsAndTokens(
 
 	account := createNewAccount(cs, &accountShardId)
 	supply := big.NewInt(14556666767)
-	tokenId := chainSim.IssueFungible(t, cs, account.Wallet.Bytes, &account.Nonce, issueCost, "TKN", "TKN", 18, supply)
+	tokenId := chainSim.IssueFungible(t, cs, cs.GetNodeHandler(core.MetachainShardId), account.Wallet.Bytes, &account.Nonce, issueCost, "TKN", "TKN", 18, supply)
 	token := chainSim.ArgsDepositToken{
 		Identifier: tokenId,
 		Nonce:      uint64(0),

diff --git a/integrationTests/chainSimulator/common.go b/integrationTests/chainSimulator/common.go
@@ -289,7 +289,7 @@ func IssueFungible(
 	txResult := SendTransaction(t, cs, sender, nonce, vm.ESDTSCAddress, issueCost, issueArgs, uint64(60000000))
 	RequireSuccessfulTransaction(t, txResult)
 
-	return getEsdtIdentifier(t, nodeHandler, tokenTicker, core.FungibleESDT)
+	return GetIssuedEsdtIdentifier(t, nodeHandler, tokenTicker, core.FungibleESDT)
 }
 
 // GetIssuedEsdtIdentifier will return the token identifier for and issued token