feat(BUX-250): block height added to TuBUMP method

beef_tx_test.go

@@ -48,7 +48,7 @@ func addGrandpaTx(ctx context.Context, t *testing.T, client ClientInterface) *Tr
 		},
 	}
 	grandpaTx.MerkleProof = MerkleProof(grandpaTxMp)
-	grandpaTx.BUMP = grandpaTx.MerkleProof.ToBUMP()
+	grandpaTx.BUMP = grandpaTx.MerkleProof.ToBUMP(grandpaTx.BlockHeight)
 	err := grandpaTx.Save(ctx)
 	require.NoError(t, err)
 

db_model_transactions.go

@@ -223,8 +223,7 @@ func (m *Transaction) migrateBUMP() error {
 		return err
 	}
 	for _, tx := range txs {
-		bump := tx.MerkleProof.ToBUMP()
-		bump.BlockHeight = tx.BlockHeight
+		bump := tx.MerkleProof.ToBUMP(tx.BlockHeight)
 		tx.BUMP = bump
 		_ = tx.Save(ctx)
 	}

model_bump_test.go

@@ -1010,7 +1010,7 @@ func TestBUMPModel_CalculateMergedBUMPAndHex(t *testing.T) {
 		// when
 		bumps := make([]BUMP, 0)
 		for _, mp := range merkleProof {
-			bumps = append(bumps, mp.ToBUMP())
+			bumps = append(bumps, mp.ToBUMP(0))
 		}
 		bump, err := CalculateMergedBUMP(bumps)
 		actualHex := bump.Hex()

model_merkle_proof.go

@@ -58,8 +58,8 @@ func (m MerkleProof) Value() (driver.Value, error) {
 }
 
 // ToBUMP transform Merkle Proof to BUMP
-func (m *MerkleProof) ToBUMP() BUMP {
-	bump := BUMP{}
+func (m *MerkleProof) ToBUMP(blockHeight uint64) BUMP {
+	bump := BUMP{BlockHeight: blockHeight}
 
 	height := len(m.Nodes)
 	if height == 0 {

model_merkle_proof_test.go

@@ -11,12 +11,15 @@ func TestMerkleProofModel_ToBUMP(t *testing.T) {
 	t.Parallel()
 
 	t.Run("Valid Merkle Proof #1", func(t *testing.T) {
+		// given
+		blockHeight := uint64(0)
 		mp := MerkleProof{
 			Index:  1,
 			TxOrID: "txId",
 			Nodes:  []string{"node0", "node1", "node2", "node3"},
 		}
 		expectedBUMP := BUMP{
+			BlockHeight: blockHeight,
 			Path: [][]BUMPLeaf{
 				{
 					{Offset: 0, Hash: "node0"},
@@ -33,17 +36,24 @@ func TestMerkleProofModel_ToBUMP(t *testing.T) {
 				},
 			},
 		}
-		actualBUMP := mp.ToBUMP()
+
+		// when
+		actualBUMP := mp.ToBUMP(blockHeight)
+
+		// then
 		assert.Equal(t, expectedBUMP, actualBUMP)
 	})
 
 	t.Run("Valid Merkle Proof #2", func(t *testing.T) {
+		// given
+		blockHeight := uint64(0)
 		mp := MerkleProof{
 			Index:  14,
 			TxOrID: "txId",
 			Nodes:  []string{"node0", "node1", "node2", "node3", "node4"},
 		}
 		expectedBUMP := BUMP{
+			BlockHeight: blockHeight,
 			Path: [][]BUMPLeaf{
 				{
 					{Offset: 14, Hash: "txId", TxID: true},
@@ -63,17 +73,24 @@ func TestMerkleProofModel_ToBUMP(t *testing.T) {
 				},
 			},
 		}
-		actualBUMP := mp.ToBUMP()
+
+		// when
+		actualBUMP := mp.ToBUMP(blockHeight)
+
+		// then
 		assert.Equal(t, expectedBUMP, actualBUMP)
 	})
 
 	t.Run("Valid Merkle Proof #3 - with *", func(t *testing.T) {
+		// given
+		blockHeight := uint64(0)
 		mp := MerkleProof{
 			Index:  14,
 			TxOrID: "txId",
 			Nodes:  []string{"*", "node1", "node2", "node3", "node4"},
 		}
 		expectedBUMP := BUMP{
+			BlockHeight: blockHeight,
 			Path: [][]BUMPLeaf{
 				{
 					{Offset: 14, Hash: "txId", TxID: true},
@@ -93,13 +110,18 @@ func TestMerkleProofModel_ToBUMP(t *testing.T) {
 				},
 			},
 		}
-		actualBUMP := mp.ToBUMP()
+
+		// when
+		actualBUMP := mp.ToBUMP(blockHeight)
+
+		// then
 		assert.Equal(t, expectedBUMP, actualBUMP)
 	})
 
 	t.Run("Empty Merkle Proof", func(t *testing.T) {
+		blockHeight := uint64(0)
 		mp := MerkleProof{}
-		actualBUMP := mp.ToBUMP()
-		assert.Equal(t, BUMP{}, actualBUMP)
+		actualBUMP := mp.ToBUMP(blockHeight)
+		assert.Equal(t, BUMP{BlockHeight: blockHeight}, actualBUMP)
 	})
 }

model_transactions.go

@@ -234,8 +234,7 @@ func (m *Transaction) setMerkleRoot(txInfo *chainstate.TransactionInfo) {
 		mp := MerkleProof(*txInfo.MerkleProof)
 		m.MerkleProof = mp
 
-		bump := mp.ToBUMP()
-		bump.BlockHeight = uint64(txInfo.BlockHeight)
+		bump := mp.ToBUMP(uint64(txInfo.BlockHeight))
 		m.BUMP = bump
 	}
 }