Merge pull request #337 from multiversx/remove-prev-proof

Remove previous proof

Author: miiu96

data/block.go

@@ -42,7 +42,6 @@ type Block struct {
 	ScheduledData         *ScheduledData         `json:"scheduledData,omitempty"`
 	EpochStartShardsData  []*EpochStartShardData `json:"epochStartShardsData,omitempty"`
 	Proof                 *api.HeaderProof       `json:"proof,omitempty"`
-	PreviousHeaderProof   *api.HeaderProof       `json:"previousHeaderProof,omitempty"`
 	RandSeed              string                 `json:"randSeed,omitempty"`
 	PrevRandSeed          string                 `json:"prevRandSeed,omitempty"`
 	Signature             string                 `json:"signature,omitempty"`

process/elasticproc/block/blockProcessor.go

@@ -147,13 +147,6 @@ func addProofs(elasticBlock *data.Block, obh *outport.OutportBlockWithHeader) {
 		elasticBlock.Proof = proofToAPIProof(obh.BlockData.HeaderProof)
 		elasticBlock.PubKeyBitmap = elasticBlock.Proof.PubKeysBitmap
 	}
-
-	prevHeaderProof := obh.Header.GetPreviousProof()
-	if check.IfNilReflect(prevHeaderProof) {
-		return
-	}
-	elasticBlock.PreviousHeaderProof = proofToAPIProof(prevHeaderProof)
-
 }
 
 func proofToAPIProof(headerProof coreData.HeaderProofHandler) *api.HeaderProof {

process/elasticproc/block/blockProcessor_test.go

@@ -266,16 +266,6 @@ func TestBlockProcessor_PrepareBlockForDBEpochStartMeta(t *testing.T) {
 				TxCount: 120,
 			},
 		},
-		PreviousHeaderProof: &dataBlock.HeaderProof{
-			PubKeysBitmap:       []byte("bitmap"),
-			AggregatedSignature: []byte("sig"),
-			HeaderHash:          []byte("hash"),
-			HeaderEpoch:         1,
-			HeaderNonce:         3,
-			HeaderShardId:       2,
-			HeaderRound:         4,
-			IsStartOfEpoch:      true,
-		},
 	}
 
 	headerBytes, _ := bp.marshalizer.Marshal(header)
@@ -321,7 +311,7 @@ func TestBlockProcessor_PrepareBlockForDBEpochStartMeta(t *testing.T) {
 		Proposer:              0,
 		Validators:            nil,
 		PubKeyBitmap:          "6269746d617031",
-		Size:                  1090,
+		Size:                  925,
 		SizeTxs:               0,
 		Timestamp:             0,
 		StateRootHash:         "",
@@ -369,16 +359,6 @@ func TestBlockProcessor_PrepareBlockForDBEpochStartMeta(t *testing.T) {
 			HeaderRound:         2,
 			IsStartOfEpoch:      false,
 		},
-		PreviousHeaderProof: &api.HeaderProof{
-			PubKeysBitmap:       "6269746d6170",
-			AggregatedSignature: "736967",
-			HeaderHash:          "68617368",
-			HeaderEpoch:         1,
-			HeaderNonce:         3,
-			HeaderShardId:       2,
-			HeaderRound:         4,
-			IsStartOfEpoch:      true,
-		},
 		EpochStartShardsData: []*data.EpochStartShardData{
 			{
 				ShardID:               1,