simplify test (#1268)

Author: ceyonur

plugin/evm/vm_test.go

@@ -18,7 +18,6 @@ import (
 
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/ids"
-	"github.com/ava-labs/avalanchego/snow/engine/snowman/block"
 	"github.com/ava-labs/avalanchego/snow/snowtest"
 	"github.com/ava-labs/avalanchego/upgrade"
 	"github.com/ava-labs/avalanchego/upgrade/upgradetest"
@@ -32,7 +31,6 @@ import (
 	"github.com/ava-labs/libevm/core/types"
 	"github.com/ava-labs/libevm/crypto"
 	"github.com/ava-labs/libevm/log"
-	"github.com/ava-labs/libevm/rlp"
 	"github.com/ava-labs/libevm/trie"
 	"github.com/holiman/uint256"
 	"github.com/stretchr/testify/assert"
@@ -2279,13 +2277,7 @@ func TestBlockGasValidation(t *testing.T) {
 	) *types.Block {
 		require := require.New(t)
 
-		chainExtra := params.GetExtra(vm.chainConfig)
-		parent := vm.eth.APIBackend.CurrentBlock()
-		const timeDelta = acp176.TimeToFillCapacity
-		timestamp := parent.Time + timeDelta
-		gasLimit, err := customheader.GasLimit(chainExtra, parent, timestamp)
-		require.NoError(err)
-		baseFee, err := customheader.BaseFee(chainExtra, parent, timestamp)
+		blk, err := vm.BuildBlock(context.Background())
 		require.NoError(err)
 
 		callPayload, err := payload.NewAddressedCall(nil, nil)
@@ -2324,8 +2316,8 @@ func TestBlockGasValidation(t *testing.T) {
 				Nonce:      1,
 				To:         &vmtest.TestEthAddrs[0],
 				Gas:        acp176.MinMaxCapacity,
-				GasFeeCap:  baseFee,
-				GasTipCap:  baseFee,
+				GasFeeCap:  big.NewInt(10),
+				GasTipCap:  big.NewInt(10),
 				Value:      common.Big0,
 				AccessList: accessList,
 			}),
@@ -2334,36 +2326,14 @@ func TestBlockGasValidation(t *testing.T) {
 		)
 		require.NoError(err)
 
-		header := &types.Header{
-			ParentHash:       parent.Hash(),
-			Coinbase:         constants.BlackholeAddr,
-			Difficulty:       new(big.Int).Add(parent.Difficulty, common.Big1),
-			Number:           new(big.Int).Add(parent.Number, common.Big1),
-			GasLimit:         gasLimit,
-			GasUsed:          0,
-			Time:             timestamp,
-			BaseFee:          baseFee,
-			BlobGasUsed:      new(uint64),
-			ExcessBlobGas:    new(uint64),
-			ParentBeaconRoot: &common.Hash{},
-		}
-
-		configExtra := params.GetExtra(vm.chainConfig)
-		header.Extra, err = customheader.ExtraPrefix(configExtra, parent, header, nil)
-		require.NoError(err)
-
-		// Set TimeMilliseconds for Granite blocks
-		if configExtra.IsGranite(timestamp) {
-			headerExtra := customtypes.GetHeaderExtra(header)
-			timeMilliseconds := timestamp * 1000
-			headerExtra.TimeMilliseconds = &timeMilliseconds
-		}
+		ethBlock := blk.(*chain.BlockWrapper).Block.(*wrappedBlock).ethBlock
+		modifiedHeader := types.CopyHeader(ethBlock.Header())
 
 		// Set the gasUsed after calculating the extra prefix to support large
 		// claimed gas used values.
-		header.GasUsed = claimedGasUsed
+		modifiedHeader.GasUsed = claimedGasUsed
 		return customtypes.NewBlockWithExtData(
-			header,
+			modifiedHeader,
 			[]*types.Transaction{tx},
 			nil,
 			nil,
@@ -2401,23 +2371,11 @@ func TestBlockGasValidation(t *testing.T) {
 			}()
 
 			blk := newBlock(t, vm, test.gasUsed)
-			blkBytes, err := rlp.EncodeToBytes(blk)
-			require.NoError(err)
 
-			parsedBlk, err := vm.ParseBlock(ctx, blkBytes)
+			modifiedBlk, err := wrapBlock(blk, vm)
 			require.NoError(err)
 
-			parsedBlkWithContext, ok := parsedBlk.(block.WithVerifyContext)
-			require.True(ok)
-
-			shouldVerify, err := parsedBlkWithContext.ShouldVerifyWithContext(ctx)
-			require.NoError(err)
-			require.True(shouldVerify)
-
-			err = parsedBlkWithContext.VerifyWithContext(
-				ctx,
-				&block.Context{},
-			)
+			err = modifiedBlk.Verify(ctx)
 			require.ErrorIs(err, test.want)
 		})
 	}