chore: remove Block and Hooks type aliases

Author: ARR4N

block.go

@@ -15,9 +15,7 @@ import (
 	"go.uber.org/zap"
 )
 
-type Block = blocks.Block
-
-func (vm *VM) AcceptBlock(ctx context.Context, b *Block) error {
+func (vm *VM) AcceptBlock(ctx context.Context, b *blocks.Block) error {
 	batch := vm.db.NewBatch()
 	rawdb.WriteBlock(batch, b.Block)
 	rawdb.WriteCanonicalHash(batch, b.Hash(), b.NumberU64())
@@ -66,7 +64,7 @@ func (vm *VM) AcceptBlock(ctx context.Context, b *Block) error {
 	return vm.blocks.Use(ctx, func(bm blockMap) error {
 		// Same rationale as the invariant described in [Block]. Praised be the
 		// GC!
-		prune := func(b *Block) {
+		prune := func(b *blocks.Block) {
 			delete(bm, b.Hash())
 			vm.logger().Debug(
 				"Pruning settled block",
@@ -93,12 +91,12 @@ func (vm *VM) AcceptBlock(ctx context.Context, b *Block) error {
 	})
 }
 
-func (vm *VM) RejectBlock(ctx context.Context, b *Block) error {
+func (vm *VM) RejectBlock(ctx context.Context, b *blocks.Block) error {
 	// TODO(arr4n) add the transactions back to the mempool if necessary.
 	return nil
 }
 
-func (vm *VM) VerifyBlock(ctx context.Context, b *Block) error {
+func (vm *VM) VerifyBlock(ctx context.Context, b *blocks.Block) error {
 	parent, err := vm.GetBlock(ctx, ids.ID(b.ParentHash()))
 	if err != nil {
 		return fmt.Errorf("block parent %#x not found (presumed height %d)", b.ParentHash(), b.Height()-1)

builder.go

@@ -18,10 +18,10 @@ import (
 	"go.uber.org/zap"
 )
 
-func (vm *VM) buildBlock(ctx context.Context, timestamp uint64, parent *Block) (*Block, error) {
+func (vm *VM) buildBlock(ctx context.Context, timestamp uint64, parent *blocks.Block) (*blocks.Block, error) {
 	block, err := sink.FromPriorityMutex(
 		ctx, vm.mempool, sink.MaxPriority,
-		func(_ <-chan sink.Priority, pool *queue.Priority[*pendingTx]) (*Block, error) {
+		func(_ <-chan sink.Priority, pool *queue.Priority[*pendingTx]) (*blocks.Block, error) {
 			return vm.buildBlockWithCandidateTxs(timestamp, parent, pool)
 		},
 	)
@@ -43,7 +43,7 @@ var (
 	errNoopBlock           = errors.New("block does not settle state nor include transactions")
 )
 
-func (vm *VM) buildBlockWithCandidateTxs(timestamp uint64, parent *Block, candidateTxs queue.Queue[*pendingTx]) (*Block, error) {
+func (vm *VM) buildBlockWithCandidateTxs(timestamp uint64, parent *blocks.Block, candidateTxs queue.Queue[*pendingTx]) (*blocks.Block, error) {
 	if timestamp < parent.Time() {
 		return nil, fmt.Errorf("block at time %d before parent at %d", timestamp, parent.Time())
 	}
@@ -106,8 +106,8 @@ func (vm *VM) buildBlockWithCandidateTxs(timestamp uint64, parent *Block, candid
 	return blocks.New(ethB, parent, toSettle, vm.logger())
 }
 
-func (vm *VM) buildBlockOnHistory(lastSettled, parent *Block, timestamp uint64, candidateTxs queue.Queue[*pendingTx]) (_ types.Transactions, _ gas.Gas, retErr error) {
-	var history []*Block
+func (vm *VM) buildBlockOnHistory(lastSettled, parent *blocks.Block, timestamp uint64, candidateTxs queue.Queue[*pendingTx]) (_ types.Transactions, _ gas.Gas, retErr error) {
+	var history []*blocks.Block
 	for b := parent; b.ID() != lastSettled.ID(); b = b.ParentBlock() {
 		history = append(history, b)
 	}
@@ -209,7 +209,7 @@ func errIsOneOf(err error, targets ...error) bool {
 	return false
 }
 
-func (vm *VM) lastBlockToSettleAt(timestamp uint64, parent *Block) (*Block, bool) {
+func (vm *VM) lastBlockToSettleAt(timestamp uint64, parent *blocks.Block) (*blocks.Block, bool) {
 	settleAt := intmath.BoundedSubtract(timestamp, stateRootDelaySeconds, vm.last.synchronousTime)
 	return blocks.LastToSettleAt(settleAt, parent)
 }

db.go

@@ -103,7 +103,7 @@ func (vm *VM) recoverFromDB(ctx context.Context, chainConfig *params.ChainConfig
 
 	return vm.blocks.Replace(ctx, func(blockMap) (blockMap, error) {
 		byID := make(blockMap)
-		byNum := make(map[uint64]*Block)
+		byNum := make(map[uint64]*blocks.Block)
 
 		for i, num := range nums {
 			hash := hashes[i]

harness.go

@@ -12,13 +12,15 @@ import (
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/core/state"
 	"github.com/ava-labs/strevm/adaptor"
+	"github.com/ava-labs/strevm/blocks"
+	"github.com/ava-labs/strevm/hook"
 )
 
 func init() {
 	var (
 		vm *SinceGenesis
-		_  snowcommon.VM           = vm
-		_  adaptor.ChainVM[*Block] = vm
+		_  snowcommon.VM                  = vm
+		_  adaptor.ChainVM[*blocks.Block] = vm
 	)
 }
 
@@ -30,7 +32,7 @@ func init() {
 type SinceGenesis struct {
 	*VM // Populated by [SinceGenesis.Initialize]
 	// Propagated to [Config]
-	Hooks Hooks
+	Hooks hook.Points
 	Now   func() time.Time
 }
 

hooks.go

@@ -133,7 +133,7 @@ func (b *ethAPIBackend) resolveBlockNumber(num rpc.BlockNumber) (uint64, common.
 
 // blockNumAndHash always returns a nil error; the signature is for convenience
 // when used in [ethAPIBackend.resolveBlockNumber].
-func (*ethAPIBackend) blockNumAndHash(block *atomic.Pointer[Block]) (uint64, common.Hash, error) {
+func (*ethAPIBackend) blockNumAndHash(block *atomic.Pointer[blocks.Block]) (uint64, common.Hash, error) {
 	b := block.Load()
 	return b.NumberU64(), b.Hash(), nil
 }

rpc.go

@@ -123,7 +123,7 @@ func TestBasicE2E(t *testing.T) {
 		assert.Nil(t, block.LastSettled(), "last settled")
 		assert.True(t, block.Executed(), "executed")
 
-		for k, ptr := range map[string]*atomic.Pointer[Block]{
+		for k, ptr := range map[string]*atomic.Pointer[blocks.Block]{
 			"accepted": &vm.last.accepted,
 			"executed": &vm.last.executed,
 			"settled":  &vm.last.settled,
@@ -192,8 +192,8 @@ func TestBasicE2E(t *testing.T) {
 	require.NoErrorf(t, err, "%T.SubscribeFilterLogs()", err)
 
 	var (
-		acceptedBlocks      []*Block
-		blockWithLastTx     *Block
+		acceptedBlocks      []*blocks.Block
+		blockWithLastTx     *blocks.Block
 		waitingForExecution int
 	)
 	start := time.Now()
@@ -575,7 +575,7 @@ func cmpVMs(ctx context.Context, tb testing.TB) cmp.Options {
 			require.NoError(tb, err)
 			return bm
 		}),
-		cmp.Transformer("atomic_block", func(p atomic.Pointer[Block]) *Block {
+		cmp.Transformer("atomic_block", func(p atomic.Pointer[blocks.Block]) *blocks.Block {
 			return p.Load()
 		}),
 		cmp.Transformer("state_dump", func(db *state.StateDB) state.Dump {

sae_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/ava-labs/libevm/params"
 	"github.com/ava-labs/libevm/rlp"
 	"github.com/ava-labs/strevm/blocks"
+	"github.com/ava-labs/strevm/hook"
 	"github.com/ava-labs/strevm/queue"
 	"github.com/ava-labs/strevm/saexec"
 )
@@ -35,13 +36,13 @@ type VM struct {
 	snowCtx *snow.Context
 	snowcommon.AppHandler
 	toEngine chan<- snowcommon.Message
-	hooks    Hooks
+	hooks    hook.Points
 	now      func() time.Time
 
 	consensusState utils.Atomic[snow.State]
 
 	blocks     sink.Mutex[blockMap]
-	preference atomic.Pointer[Block]
+	preference atomic.Pointer[blocks.Block]
 	last       last
 
 	db ethdb.Database
@@ -56,15 +57,15 @@ type VM struct {
 }
 
 type (
-	blockMap map[common.Hash]*Block
+	blockMap map[common.Hash]*blocks.Block
 	last     struct {
 		synchronousTime             uint64
-		accepted, executed, settled atomic.Pointer[Block]
+		accepted, executed, settled atomic.Pointer[blocks.Block]
 	}
 )
 
 type Config struct {
-	Hooks       Hooks
+	Hooks       hook.Points
 	ChainConfig *params.ChainConfig
 	DB          ethdb.Database
 	// At the point of upgrade from synchronous to asynchronous execution, the
@@ -129,7 +130,7 @@ func New(ctx context.Context, c Config) (*VM, error) {
 	return vm, nil
 }
 
-func (vm *VM) newBlock(b *types.Block, parent, lastSettled *Block) (*Block, error) {
+func (vm *VM) newBlock(b *types.Block, parent, lastSettled *blocks.Block) (*blocks.Block, error) {
 	return blocks.New(b, parent, lastSettled, vm.logger())
 }
 
@@ -186,8 +187,8 @@ func (vm *VM) CreateHandlers(context.Context) (map[string]http.Handler, error) {
 	}, nil
 }
 
-func (vm *VM) GetBlock(ctx context.Context, blkID ids.ID) (*Block, error) {
-	b, err := sink.FromMutex(ctx, vm.blocks, func(blocks blockMap) (*Block, error) {
+func (vm *VM) GetBlock(ctx context.Context, blkID ids.ID) (*blocks.Block, error) {
+	b, err := sink.FromMutex(ctx, vm.blocks, func(blocks blockMap) (*blocks.Block, error) {
 		if b, ok := blocks[common.Hash(blkID)]; ok {
 			return b, nil
 		}
@@ -216,7 +217,7 @@ func (vm *VM) GetBlock(ctx context.Context, blkID ids.ID) (*Block, error) {
 	return vm.newBlock(ethB, nil, nil)
 }
 
-func (vm *VM) ParseBlock(ctx context.Context, blockBytes []byte) (*Block, error) {
+func (vm *VM) ParseBlock(ctx context.Context, blockBytes []byte) (*blocks.Block, error) {
 	b := new(types.Block)
 	if err := rlp.DecodeBytes(blockBytes, b); err != nil {
 		return nil, err
@@ -227,7 +228,7 @@ func (vm *VM) ParseBlock(ctx context.Context, blockBytes []byte) (*Block, error)
 	return vm.newBlock(b, nil, nil)
 }
 
-func (vm *VM) BuildBlock(ctx context.Context) (*Block, error) {
+func (vm *VM) BuildBlock(ctx context.Context) (*blocks.Block, error) {
 	return vm.buildBlock(ctx, uint64(vm.now().Unix()), vm.preference.Load())
 }