rebase conflicts

Author: samliok

simplex/block.go

@@ -155,9 +155,6 @@ type blockTracker struct {
 
 	// handles block acceptance and rejection of inner blocks
 	tree tree.Tree
-
-	// digest of the last block that was indexed
-	lastIndexed simplex.Digest
 }
 
 func newBlockTracker(latestBlock *Block) *blockTracker {
@@ -166,7 +163,6 @@ func newBlockTracker(latestBlock *Block) *blockTracker {
 		simplexDigestsToBlock: map[simplex.Digest]*Block{
 			latestBlock.digest: latestBlock,
 		},
-		lastIndexed: latestBlock.digest,
 	}
 }
 
@@ -218,11 +214,5 @@ func (bt *blockTracker) indexBlock(ctx context.Context, digest simplex.Digest) e
 	}
 
 	// notify the VM that we are accepting this block, and reject all competing blocks
-	err := bt.tree.Accept(ctx, bd.vmBlock)
-	if err != nil {
-		return fmt.Errorf("failed to accept block: %w", err)
-	}
-
-	bt.lastIndexed = digest
-	return nil
+	return bt.tree.Accept(ctx, bd.vmBlock)
 }

simplex/block_builder.go

@@ -35,13 +35,13 @@ func (b *BlockBuilder) BuildBlock(ctx context.Context, metadata simplex.Protocol
 		default:
 			err := b.incomingBlock(ctx)
 			if err != nil {
-				b.log.Debug("Error waiting for incoming block:", zap.Error(err))
+				b.log.Debug("Error waiting for incoming block", zap.Error(err))
 				curWait = backoff(ctx, curWait, maxBackoff)
 				continue
 			}
 			vmBlock, err := b.vm.BuildBlock(ctx)
 			if err != nil {
-				b.log.Info("Error building block:", zap.Error(err))
+				b.log.Info("Error building block", zap.Error(err))
 				curWait = backoff(ctx, curWait, maxBackoff)
 				continue
 			}
@@ -52,7 +52,7 @@ func (b *BlockBuilder) BuildBlock(ctx context.Context, metadata simplex.Protocol
 			curWait = 10 * time.Millisecond // Reset backoff after a successful block build
 			verifiedBlock, err := simplexBlock.Verify(ctx)
 			if err != nil {
-				b.log.Info("Error verifying block we built ourselves: %s", zap.Error(err))
+				b.log.Warn("Error verifying block we built ourselves", zap.Error(err))
 				curWait = backoff(ctx, curWait, maxBackoff)
 				continue
 			}
@@ -67,7 +67,7 @@ func (b *BlockBuilder) BuildBlock(ctx context.Context, metadata simplex.Protocol
 func (b *BlockBuilder) IncomingBlock(ctx context.Context) {
 	err := b.incomingBlock(ctx)
 	if err != nil {
-		b.log.Error("Error waiting for incoming block:", zap.Error(err))
+		b.log.Error("Error waiting for incoming block", zap.Error(err))
 	}
 }
 

simplex/storage.go

@@ -123,13 +123,10 @@ func (s *Storage) Retrieve(seq uint64) (simplex.VerifiedBlock, simplex.Finalizat
 		return nil, simplex.Finalization{}, err
 	}
 
-	vb := &Block{vmBlock: block, metadata: finalization.Finalization.ProtocolMetadata, blockTracker: s.blockTracker}
-	bytes, err := vb.Bytes()
+	vb, err := newBlock(finalization.Finalization.ProtocolMetadata, block, s.blockTracker)
 	if err != nil {
-		s.log.Error("Failed to serialize block", zap.Error(err))
 		return nil, simplex.Finalization{}, err
 	}
-	vb.digest = computeDigest(bytes)
 
 	return vb, finalization, nil
 }

simplex/storage_test.go

@@ -72,7 +72,7 @@ func TestStorageNew(t *testing.T) {
 }
 
 func TestStorageRetrieve(t *testing.T) {
-	genesis := newBlock(t, newBlockConfig{})
+	genesis := newTestBlock(t, newBlockConfig{})
 	genesisBytes, err := genesis.Bytes()
 	require.NoError(t, err)
 
@@ -131,9 +131,9 @@ func TestStorageRetrieve(t *testing.T) {
 
 func TestStorageIndexFails(t *testing.T) {
 	ctx := context.Background()
-	genesis := newBlock(t, newBlockConfig{})
-	child1 := newBlock(t, newBlockConfig{prev: genesis})
-	child2 := newBlock(t, newBlockConfig{prev: child1})
+	genesis := newTestBlock(t, newBlockConfig{})
+	child1 := newTestBlock(t, newBlockConfig{prev: genesis})
+	child2 := newTestBlock(t, newBlockConfig{prev: child1})
 
 	configs := newNetworkConfigs(t, 4)
 	configs[0].VM = genesis.vmBlock.(*wrappedBlock).vm
@@ -216,10 +216,10 @@ func TestStorageIndexFails(t *testing.T) {
 // previous digest of the block being indexed.
 func TestIndexMismatchedChild(t *testing.T) {
 	ctx := context.Background()
-	genesis := newBlock(t, newBlockConfig{})
-	child1 := newBlock(t, newBlockConfig{prev: genesis})
-	child1Sibling := newBlock(t, newBlockConfig{prev: genesis})
-	child2Nephew := newBlock(t, newBlockConfig{prev: child1Sibling})
+	genesis := newTestBlock(t, newBlockConfig{})
+	child1 := newTestBlock(t, newBlockConfig{prev: genesis})
+	child1Sibling := newTestBlock(t, newBlockConfig{prev: genesis})
+	child2Nephew := newTestBlock(t, newBlockConfig{prev: child1Sibling})
 
 	configs := newNetworkConfigs(t, 4)
 	configs[0].VM = genesis.vmBlock.(*wrappedBlock).vm
@@ -251,7 +251,7 @@ func TestIndexMismatchedChild(t *testing.T) {
 // TestStorageIndexSuccess indexes 10 blocks and verifies that they can be retrieved.
 func TestStorageIndexSuccess(t *testing.T) {
 	ctx := context.Background()
-	genesis := newBlock(t, newBlockConfig{})
+	genesis := newTestBlock(t, newBlockConfig{})
 	configs := newNetworkConfigs(t, 4)
 
 	_, verifier := NewBLSAuth(configs[0])
@@ -270,7 +270,7 @@ func TestStorageIndexSuccess(t *testing.T) {
 
 	prev := genesis
 	for i := 0; i < numBlocks; i++ {
-		child := newBlock(t, newBlockConfig{prev: prev})
+		child := newTestBlock(t, newBlockConfig{prev: prev})
 		_, err := child.Verify(ctx)
 		require.NoError(t, err)