use protoutil.InitBlockMetadata

Signed-off-by: Hagar Meir <[email protected]>

Author: HagarMeir

node/assembler/oba_utils_test.go

@@ -70,11 +70,7 @@ func (obac *OrderedBatchAttestationCreator) Append(batchId types.BatchID, decisi
 	if err != nil {
 		panic("Failed to invoke AssemblerBlockMetadataToBytes")
 	}
-	var metadataContents [][]byte
-	for i := 0; i < len(common.BlockMetadataIndex_name); i++ {
-		metadataContents = append(metadataContents, []byte{})
-	}
-	ba.OrderingInformation.CommonBlock.Metadata = &common.BlockMetadata{Metadata: metadataContents}
+	protoutil.InitBlockMetadata(ba.OrderingInformation.CommonBlock)
 	ba.OrderingInformation.CommonBlock.Metadata.Metadata[common.BlockMetadataIndex_ORDERER] = blockMetadata
 	obac.headerHash = protoutil.BlockHeaderHash(ba.OrderingInformation.CommonBlock.Header)
 	obac.prevBa = ba

node/consensus/consensus.go

@@ -486,11 +486,7 @@ func (c *Consensus) AssembleProposal(metadata []byte, requests [][]byte) smartbf
 		if err != nil {
 			c.Logger.Panicf("Failed to invoke AssemblerBlockMetadataToBytes: %s", err)
 		}
-		var metadataContents [][]byte
-		for i := 0; i < len(common.BlockMetadataIndex_name); i++ {
-			metadataContents = append(metadataContents, []byte{})
-		}
-		availableCommonBlocks[i].Metadata = &common.BlockMetadata{Metadata: metadataContents}
+		protoutil.InitBlockMetadata(availableCommonBlocks[i])
 		availableCommonBlocks[i].Metadata.Metadata[common.BlockMetadataIndex_ORDERER] = blockMetadata
 		hdr.Number = lastBlockNumber
 		hdr.PrevHash = prevHash

node/consensus/consensus_builder.go

@@ -285,11 +285,7 @@ func appendGenesisBlock(genesisBlock *common.Block, initState *state.State, cons
 
 	availableCommonBlocks := []*common.Block{genesisBlock}
 
-	var metadataContents [][]byte
-	for i := 0; i < len(common.BlockMetadataIndex_name); i++ {
-		metadataContents = append(metadataContents, []byte{})
-	}
-	availableCommonBlocks[0].Metadata = &common.BlockMetadata{Metadata: metadataContents}
+	protoutil.InitBlockMetadata(availableCommonBlocks[0])
 
 	blockMetadata, err := ledger.AssemblerBlockMetadataToBytes(state.NewAvailableBatch(0, arma_types.ShardIDConsensus, 0, genesisDigest), &state.OrderingInformation{DecisionNum: 0, BatchCount: 1, BatchIndex: 0}, 0)
 	if err != nil {

node/consensus/consensus_test.go

@@ -722,11 +722,7 @@ func TestVerifyProposal(t *testing.T) {
 	header.AvailableBlocks = []state.AvailableBlock{{Header: &state.BlockHeader{Number: latestBlockHeader.Number, PrevHash: latestBlockHeader.PreviousHash, Digest: latestBlockHeader.DataHash}, Batch: ab}}
 	header.AvailableCommonBlocks = []*common.Block{{Header: latestBlockHeader}}
 
-	var metadataContents [][]byte
-	for i := 0; i < len(common.BlockMetadataIndex_name); i++ {
-		metadataContents = append(metadataContents, []byte{})
-	}
-	header.AvailableCommonBlocks[0].Metadata = &common.BlockMetadata{Metadata: metadataContents}
+	protoutil.InitBlockMetadata(header.AvailableCommonBlocks[0])
 	blockMetadata, err := ledger.AssemblerBlockMetadataToBytes(ab, &state.OrderingInformation{DecisionNum: 0, BatchCount: 1, BatchIndex: 0}, 0)
 	require.Nil(t, err)
 	header.AvailableCommonBlocks[0].Metadata.Metadata[common.BlockMetadataIndex_ORDERER] = blockMetadata

node/ledger/assembler_ledger.go

@@ -147,11 +147,7 @@ func (l *AssemblerLedger) Append(batch types.Batch, orderingInfo types.OrderingI
 		},
 	}
 
-	var metadataContents [][]byte
-	for i := 0; i < len(common.BlockMetadataIndex_name); i++ {
-		metadataContents = append(metadataContents, []byte{})
-	}
-	block.Metadata = &common.BlockMetadata{Metadata: metadataContents}
+	protoutil.InitBlockMetadata(block)
 
 	var sigs []*common.MetadataSignature
 	var signers []uint64