wip

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
ava-labs · May 6, 2024 · 1a3ca3e · 1a3ca3e
1 parent d7d2ad3
commit 1a3ca3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/vms/proposervm/vm.go b/vms/proposervm/vm.go
@@ -358,6 +358,7 @@ func (vm *VM) SetPreference(ctx context.Context, preferred ids.ID) error {
 			return err
 		}
 
+		vm.ctx.Log.Debug("inserting processing block", zap.Stringer("blkID", postFork.getStatelessBlk().ID()))
 		if err := vm.State.PutProcessingBlock(optionBlk.ID()); err != nil {
 			return err
 		}
@@ -774,10 +775,11 @@ func (vm *VM) verifyAndRecordInnerBlk(ctx context.Context, blockCtx *block.Conte
 		return err
 	}
 
-	if err := vm.State.PutProcessingBlock(postFork.ID()); err != nil {
+	if err := vm.State.PutProcessingBlock(postFork.getStatelessBlk().ID()); err != nil {
 		return err
 	}
 
+	vm.ctx.Log.Debug("inserting processing block", zap.Stringer("blkID", postFork.getStatelessBlk().ID()))
 	if err := vm.State.PutBlock(postFork.getStatelessBlk(), choices.Processing); err != nil {
 		return err
 	}

diff --git a/vms/proposervm/vm_test.go b/vms/proposervm/vm_test.go
@@ -2194,7 +2194,7 @@ func TestVM_VerifyBlockWithContext(t *testing.T) {
 		blk.EXPECT().getInnerBlk().Return(innerBlk).AnyTimes()
 		blkID := ids.GenerateTestID()
 		blk.EXPECT().ID().Return(blkID).AnyTimes()
-		blk.EXPECT().getStatelessBlk().Return(statelessBlk).Times(2)
+		blk.EXPECT().getStatelessBlk().Return(statelessBlk).AnyTimes()
 
 		require.NoError(vm.verifyAndRecordInnerBlk(
 			context.Background(),
@@ -2237,7 +2237,7 @@ func TestVM_VerifyBlockWithContext(t *testing.T) {
 		blk.EXPECT().getInnerBlk().Return(innerBlk).AnyTimes()
 		blkID := ids.GenerateTestID()
 		blk.EXPECT().ID().Return(blkID).AnyTimes()
-		blk.EXPECT().getStatelessBlk().Return(statelessBlk)
+		blk.EXPECT().getStatelessBlk().Return(statelessBlk).AnyTimes()
 		require.NoError(vm.verifyAndRecordInnerBlk(
 			context.Background(),
 			&block.Context{
@@ -2260,7 +2260,7 @@ func TestVM_VerifyBlockWithContext(t *testing.T) {
 		blk.EXPECT().getInnerBlk().Return(innerBlk).AnyTimes()
 		blkID := ids.GenerateTestID()
 		blk.EXPECT().ID().Return(blkID).AnyTimes()
-		blk.EXPECT().getStatelessBlk().Return(statelessBlk)
+		blk.EXPECT().getStatelessBlk().Return(statelessBlk).AnyTimes()
 		require.NoError(vm.verifyAndRecordInnerBlk(context.Background(), nil, blk))
 	}
 }