nits

Author: patrick-ogrady

chain/block.go

@@ -144,6 +144,7 @@ func (b *StatelessBlock) verify() (*StatelessBlock, *versiondb.Database, error)
 	if b.Difficulty != context.NextDifficulty {
 		return nil, nil, ErrInvalidDifficulty
 	}
+
 	parentState, err := parent.onAccept()
 	if err != nil {
 		return nil, nil, err
@@ -154,7 +155,6 @@ func (b *StatelessBlock) verify() (*StatelessBlock, *versiondb.Database, error)
 	if err := ExpireNext(onAcceptDB, parent.Tmstmp, b.Tmstmp); err != nil {
 		return nil, nil, err
 	}
-
 	// Reward producer (if [b.Beneficiary] is non-nil)
 	if err := Reward(onAcceptDB, b.Beneficiary); err != nil {
 		return nil, nil, err

chain/block_test.go

@@ -173,7 +173,7 @@ func createTestBlk(
 	if err := parentBlk.init(); err != nil {
 		t.Fatal(err)
 	}
-	vm.EXPECT().GetBlock(parentBlk.ID()).Return(parentBlk, nil)
+	vm.EXPECT().GetStatelessBlock(parentBlk.ID()).Return(parentBlk, nil)
 
 	blk := NewBlock(vm, parentBlk, blkTmpstp, nil, blkCtx)
 	if uint64(blk.StatefulBlock.Tmstmp) != uint64(blkTmpstp) {

chain/builder.go

@@ -28,17 +28,17 @@ func BuildBlock(vm VM, preferred ids.ID) (snowman.Block, error) {
 	}
 	b := NewBlock(vm, parent, nextTime, vm.Beneficiary(), context)
 
-	// Select new transactions
+	// Clean out invalid txs
+	mempool := vm.Mempool()
+	mempool.Prune(context.RecentBlockIDs)
+
 	parentDB, err := parent.onAccept()
 	if err != nil {
 		log.Debug("block building failed: couldn't get parent db", "err", err)
 		return nil, err
 	}
-	mempool := vm.Mempool()
-	mempool.Prune(context.RecentBlockIDs) // clean out invalid txs
-
-	// TODO: move all this setup somewhere shared
 	vdb := versiondb.New(parentDB)
+
 	// Remove all expired prefixes
 	if err := ExpireNext(vdb, parent.Tmstmp, b.Tmstmp); err != nil {
 		return nil, err