FIX: After review

multiversx · Feb 13, 2025 · f1bce8f · f1bce8f
1 parent 7673f05
commit f1bce8f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/server/bridgeServer_test.go b/server/bridgeServer_test.go
@@ -5,10 +5,9 @@ import (
 	"testing"
 
 	"github.com/multiversx/mx-chain-core-go/data/sovereign"
+	"github.com/stretchr/testify/require"
 
 	"github.com/multiversx/mx-chain-sovereign-bridge-go/testscommon"
-
-	"github.com/stretchr/testify/require"
 )
 
 func TestNewSovereignBridgeTxServer(t *testing.T) {

diff --git a/server/txSender/dataFormatter.go b/server/txSender/dataFormatter.go
@@ -68,14 +68,11 @@ func (df *dataFormatter) createRegisterBridgeOperationsData(bridgeData *sovereig
 
 	registerBridgeOpData := []byte(registerBridgeOpsPrefix +
 		"@" + hex.EncodeToString(bridgeData.AggregatedSignature) +
-		"@" + hex.EncodeToString(bridgeData.Hash))
-	registerBridgeOpData = append(registerBridgeOpData, hashesHexEncodedArgs...)
-
-	bridgeDataArgs := []byte(
+		"@" + hex.EncodeToString(bridgeData.Hash) +
 		"@" + hex.EncodeToString(bridgeData.PubKeysBitmap) +
-			"@" + hex.EncodeToString(uint32ToBytes(bridgeData.Epoch)))
+		"@" + hex.EncodeToString(uint32ToBytes(bridgeData.Epoch)))
 
-	return append(registerBridgeOpData, bridgeDataArgs...)
+	return append(registerBridgeOpData, hashesHexEncodedArgs...)
 }
 
 func uint32ToBytes(value uint32) []byte {

diff --git a/server/txSender/dataFormatter_test.go b/server/txSender/dataFormatter_test.go
@@ -123,10 +123,10 @@ func TestDataFormatter_CreateTxsData(t *testing.T) {
 			registerBridgeOpsPrefix +
 				"@" + hex.EncodeToString(aggregatedSig1) +
 				"@" + hex.EncodeToString(bridgeDataHash1) +
-				"@" + hex.EncodeToString(opHash1) +
-				"@" + hex.EncodeToString(opHash2) +
 				"@" + hex.EncodeToString(pubKeysBitmap1) +
-				"@" + "00000001")
+				"@" + "00000001" +
+				"@" + hex.EncodeToString(opHash1) +
+				"@" + hex.EncodeToString(opHash2))
 		execOp1 := []byte(executeBridgeOpsPrefix +
 			"@" + hex.EncodeToString(bridgeDataHash1) +
 			"@" + hex.EncodeToString(bridgeDataOp1))
@@ -138,9 +138,9 @@ func TestDataFormatter_CreateTxsData(t *testing.T) {
 			registerBridgeOpsPrefix +
 				"@" + hex.EncodeToString(aggregatedSig2) +
 				"@" + hex.EncodeToString(bridgeDataHash2) +
-				"@" + hex.EncodeToString(opHash3) +
 				"@" + hex.EncodeToString(pubKeysBitmap2) +
-				"@" + "00000002")
+				"@" + "00000002" +
+				"@" + hex.EncodeToString(opHash3))
 		execOp3 := []byte(executeBridgeOpsPrefix +
 			"@" + hex.EncodeToString(bridgeDataHash2) +
 			"@" + hex.EncodeToString(bridgeDataOp3))