Pass block tracker in deserialize block (#4266)

Author: samliok

simplex/block.go

@@ -119,7 +119,8 @@ func computeDigest(bytes []byte) simplex.Digest {
 }
 
 type blockDeserializer struct {
-	parser block.Parser
+	parser       block.Parser
+	blockTracker *blockTracker
 }
 
 func (d *blockDeserializer) DeserializeBlock(ctx context.Context, bytes []byte) (simplex.Block, error) {
@@ -139,11 +140,7 @@ func (d *blockDeserializer) DeserializeBlock(ctx context.Context, bytes []byte)
 		return nil, err
 	}
 
-	return &Block{
-		metadata: *md,
-		vmBlock:  vmblock,
-		digest:   computeDigest(bytes),
-	}, nil
+	return newBlock(*md, vmblock, d.blockTracker)
 }
 
 // blockTracker is used to ensure that blocks are properly rejected, if competing blocks are accepted.

simplex/block_test.go

@@ -24,6 +24,7 @@ import (
 func TestBlockSerialization(t *testing.T) {
 	unexpectedBlockBytes := errors.New("unexpected block bytes")
 	ctx := context.Background()
+	genesisBlock := newTestBlock(t, newBlockConfig{})
 	testBlock := snowmantest.BuildChild(snowmantest.Genesis)
 
 	b := &Block{
@@ -33,7 +34,7 @@ func TestBlockSerialization(t *testing.T) {
 			Epoch:   1,
 			Round:   1,
 			Seq:     1,
-			Prev:    [32]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07},
+			Prev:    genesisBlock.digest,
 		},
 	}
 
@@ -86,7 +87,8 @@ func TestBlockSerialization(t *testing.T) {
 
 			testVM.ParseBlockF = tt.parseFunc
 			deserializer := &blockDeserializer{
-				parser: testVM,
+				parser:       testVM,
+				blockTracker: newBlockTracker(genesisBlock),
 			}
 
 			// Deserialize the block
@@ -95,6 +97,8 @@ func TestBlockSerialization(t *testing.T) {
 
 			if tt.expectedError == nil {
 				require.Equal(t, b.BlockHeader().ProtocolMetadata, deserializedBlock.BlockHeader().ProtocolMetadata)
+				_, err := deserializedBlock.Verify(ctx)
+				require.NoError(t, err)
 			}
 		})
 	}