Merge pull request #385 from multiversx/refactored-balance-checking

Refactored balance checking mechanism in e2e tests
multiversx · Dec 3, 2024 · d71371a · d71371a
2 parents 257b1cf + 4a32880
commit d71371a
Show file tree

Hide file tree

Showing 11 changed files with 632 additions and 406 deletions.
diff --git a/integrationTests/relayers/slowTests/common.go b/integrationTests/relayers/slowTests/common.go
diff --git a/integrationTests/relayers/slowTests/edgeCases_test.go b/integrationTests/relayers/slowTests/edgeCases_test.go
@@ -15,8 +15,6 @@ import (
 )
 
 func TestRelayerShouldExecuteSimultaneousSwapsAndNotCatchErrors(t *testing.T) {
-	t.Skip("TODO: fix this test")
-
 	errorString := "ERROR"
 	mockLogObserver := mock.NewMockLogObserver(errorString, "got invalid action ID")
 	err := logger.AddLogObserver(mockLogObserver, &logger.PlainFormatter{})
@@ -51,15 +49,40 @@ func TestRelayerShouldExecuteSimultaneousSwapsAndNotCatchErrors(t *testing.T) {
 			MvxForceSCCall:       false,
 		},
 	}
-	usdcToken.ESDTSafeExtraBalance = big.NewInt(50)
-	usdcToken.ExtraBalances = map[string]framework.ExtraBalanceHolder{
-		"Alice": {
-			SentAmount:     big.NewInt(-5000),
-			ReceivedAmount: big.NewInt(0),
+	usdcToken.DeltaBalances = map[framework.HalfBridgeIdentifier]framework.DeltaBalancesOnKeys{
+		framework.FirstHalfBridge: map[string]*framework.DeltaBalanceHolder{
+			framework.Alice: {
+				OnEth:    big.NewInt(-5000),
+				OnMvx:    big.NewInt(0),
+				MvxToken: framework.UniversalToken,
+			},
+			framework.Bob: {
+				OnEth:    big.NewInt(0),
+				OnMvx:    big.NewInt(5000),
+				MvxToken: framework.UniversalToken,
+			},
+			framework.SafeSC: {
+				OnEth:    big.NewInt(5000),
+				OnMvx:    big.NewInt(0),
+				MvxToken: framework.ChainSpecificToken,
+			},
 		},
-		"Bob": {
-			SentAmount:     big.NewInt(-200),
-			ReceivedAmount: big.NewInt(5000),
+		framework.SecondHalfBridge: map[string]*framework.DeltaBalanceHolder{
+			framework.Alice: {
+				OnEth:    big.NewInt(-5000 - 5000 + 150),
+				OnMvx:    big.NewInt(0),
+				MvxToken: framework.UniversalToken,
+			},
+			framework.Bob: {
+				OnEth:    big.NewInt(0),
+				OnMvx:    big.NewInt(5000 + 4800),
+				MvxToken: framework.UniversalToken,
+			},
+			framework.SafeSC: {
+				OnEth:    big.NewInt(5000 + 5000 - 150),
+				OnMvx:    big.NewInt(50),
+				MvxToken: framework.ChainSpecificToken,
+			},
 		},
 	}
 

diff --git a/integrationTests/relayers/slowTests/ethToMultiversXWithChainSimulator_test.go b/integrationTests/relayers/slowTests/ethToMultiversXWithChainSimulator_test.go
@@ -191,7 +191,7 @@ func testRelayersWithChainSimulatorAndTokens(tb testing.TB, manualStopChan chan
 	}
 
 	processFunc := func(tb testing.TB, setup *framework.TestSetup) bool {
-		if startsFromEthFlow.process() && startsFromMvXFlow.process() && startsFromEthFlow.areTokensFullyRefunded() {
+		if startsFromEthFlow.process() && startsFromMvXFlow.process() {
 			setup.TestWithdrawTotalFeesOnEthereumForTokens(startsFromMvXFlow.tokens...)
 			setup.TestWithdrawTotalFeesOnEthereumForTokens(startsFromEthFlow.tokens...)
 
@@ -311,11 +311,29 @@ func createBadToken() framework.TestTokenParams {
 				MvxSCCallData:        createScCallData("callPayable", 50000000),
 			},
 		},
-		ESDTSafeExtraBalance: big.NewInt(0),
-		ExtraBalances: map[string]framework.ExtraBalanceHolder{
-			"Alice":   {SentAmount: big.NewInt(-5000 - 7000 - 1000), ReceivedAmount: big.NewInt(0), RefundAmount: big.NewInt(0)},
-			"Bob":     {SentAmount: big.NewInt(-2500 - 300), ReceivedAmount: big.NewInt(5000 + 7000), RefundAmount: big.NewInt(0)},
-			"Charlie": {SentAmount: big.NewInt(0), ReceivedAmount: big.NewInt(2500 - 50 + 300 - 50), RefundAmount: big.NewInt(0)},
+		DeltaBalances: map[framework.HalfBridgeIdentifier]framework.DeltaBalancesOnKeys{
+			framework.FirstHalfBridge: map[string]*framework.DeltaBalanceHolder{
+				framework.Alice: {
+					OnEth:    big.NewInt(-5000 - 7000 - 1000),
+					OnMvx:    big.NewInt(0),
+					MvxToken: framework.UniversalToken,
+				},
+				framework.Bob: {
+					OnEth:    big.NewInt(0),
+					OnMvx:    big.NewInt(5000 + 7000),
+					MvxToken: framework.UniversalToken,
+				},
+				framework.SafeSC: {
+					OnEth:    big.NewInt(5000 + 7000),
+					OnMvx:    big.NewInt(0),
+					MvxToken: framework.ChainSpecificToken,
+				},
+				framework.CalledTestSC: {
+					OnEth:    big.NewInt(0),
+					OnMvx:    big.NewInt(0),
+					MvxToken: framework.UniversalToken,
+				},
+			},
 		},
 	}
 }

diff --git a/integrationTests/relayers/slowTests/framework/common.go b/integrationTests/relayers/slowTests/framework/common.go
@@ -7,6 +7,24 @@ import (
 	logger "github.com/multiversx/mx-chain-logger-go"
 )
 
+// HalfBridgeIdentifier is the type that holds the half-bridge identifier (counter)
+type HalfBridgeIdentifier string
+
+// TokenBalanceType represents the token type that should be checked for balance
+type TokenBalanceType string
+
+const (
+	// FirstHalfBridge represents the first half bridge in the tests
+	FirstHalfBridge HalfBridgeIdentifier = "first half bridge"
+	// SecondHalfBridge represents the second half bridge in the tests
+	SecondHalfBridge HalfBridgeIdentifier = "second half bridge"
+
+	// UniversalToken is the universal token identifier
+	UniversalToken TokenBalanceType = "universal"
+	// ChainSpecificToken is the chain-specific token identifier
+	ChainSpecificToken TokenBalanceType = "chain-specific"
+)
+
 var (
 	log                       = logger.GetOrCreate("integrationtests/slowtests")
 	addressPubkeyConverter, _ = pubkeyConverter.NewBech32PubkeyConverter(32, "erd")

diff --git a/integrationTests/relayers/slowTests/framework/keys.go b/integrationTests/relayers/slowTests/framework/keys.go
@@ -58,6 +58,9 @@ const (
 	Alice          = "Alice"
 	Bob            = "Bob"
 	Charlie        = "Charlie"
+	WrapperSC      = "Wrapper SC"
+	CalledTestSC   = "Called test SC"
+	SafeSC         = "Safe SC"
 	AddressZero    = "AddressZero"
 )