chore(ci): upgrade golangci to v1.56.2 (#622)

mask-pp · web-flow · commit 9461b05fa306 · 2024-03-11T03:09:26.000Z
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ clean:
 	@rm -rf bin/*
 
 lint:
-	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.1 \
+	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2 \
 	&& golangci-lint run
 
 test:
diff --git a/driver/driver.go b/driver/driver.go
@@ -101,7 +101,7 @@ func (d *Driver) Start() error {
 }
 
 // Close closes the driver instance.
-func (d *Driver) Close(ctx context.Context) {
+func (d *Driver) Close(_ context.Context) {
 	d.l1HeadSub.Unsubscribe()
 	d.state.Close()
 	d.wg.Wait()
diff --git a/driver/txlist_fetcher/blob.go b/driver/txlist_fetcher/blob.go
@@ -24,7 +24,7 @@ func NewBlobTxListFetcher(rpc *rpc.Client) *BlobFetcher {
 
 func (d *BlobFetcher) Fetch(
 	ctx context.Context,
-	tx *types.Transaction,
+	_ *types.Transaction,
 	meta *bindings.TaikoDataBlockMetadata,
 ) ([]byte, error) {
 	if !meta.BlobUsed {
diff --git a/driver/txlist_fetcher/calldata.go b/driver/txlist_fetcher/calldata.go
@@ -11,7 +11,7 @@ import (
 type CalldataFetcher struct{}
 
 func (d *CalldataFetcher) Fetch(
-	ctx context.Context,
+	_ context.Context,
 	tx *types.Transaction,
 	meta *bindings.TaikoDataBlockMetadata,
 ) ([]byte, error) {
diff --git a/pkg/chain_iterator/block_batch_iterator_test.go b/pkg/chain_iterator/block_batch_iterator_test.go
@@ -32,10 +32,10 @@ func (s *BlockBatchIteratorTestSuite) TestIter() {
 		StartHeight:           common.Big0,
 		EndHeight:             new(big.Int).SetUint64(headHeight),
 		OnBlocks: func(
-			ctx context.Context,
+			_ context.Context,
 			start, end *types.Header,
-			updateCurrentFunc UpdateCurrentFunc,
-			endIterFunc EndIterFunc,
+			_ UpdateCurrentFunc,
+			_ EndIterFunc,
 		) error {
 			s.Equal(lastEnd.Uint64(), start.Number.Uint64())
 			lastEnd = end.Number
@@ -63,9 +63,9 @@ func (s *BlockBatchIteratorTestSuite) TestIterEndFunc() {
 		StartHeight:           common.Big0,
 		EndHeight:             new(big.Int).SetUint64(headHeight),
 		OnBlocks: func(
-			ctx context.Context,
+			_ context.Context,
 			start, end *types.Header,
-			updateCurrentFunc UpdateCurrentFunc,
+			_ UpdateCurrentFunc,
 			endIterFunc EndIterFunc,
 		) error {
 			s.Equal(lastEnd.Uint64(), start.Number.Uint64())
@@ -93,9 +93,9 @@ func (s *BlockBatchIteratorTestSuite) TestIterCtxCancel() {
 		StartHeight:           common.Big0,
 		EndHeight:             new(big.Int).SetUint64(headHeight),
 		OnBlocks: func(
-			ctx context.Context,
+			_ context.Context,
 			start, end *types.Header,
-			updateCurrentFunc UpdateCurrentFunc,
+			_ UpdateCurrentFunc,
 			endIterFunc EndIterFunc,
 		) error {
 			s.Equal(lastEnd.Uint64(), start.Number.Uint64())
@@ -128,9 +128,9 @@ func (s *BlockBatchIteratorTestSuite) TestBlockBatchIteratorConfig() {
 	_, err3 := NewBlockBatchIterator(context.Background(), &BlockBatchIteratorConfig{
 		Client: s.RPCClient.L1,
 		OnBlocks: func(
-			ctx context.Context,
+			_ context.Context,
 			start, end *types.Header,
-			updateCurrentFunc UpdateCurrentFunc,
+			_ UpdateCurrentFunc,
 			endIterFunc EndIterFunc,
 		) error {
 			s.Equal(lastEnd.Uint64(), start.Number.Uint64())
@@ -145,9 +145,9 @@ func (s *BlockBatchIteratorTestSuite) TestBlockBatchIteratorConfig() {
 	_, err4 := NewBlockBatchIterator(context.Background(), &BlockBatchIteratorConfig{
 		Client: s.RPCClient.L1,
 		OnBlocks: func(
-			ctx context.Context,
+			_ context.Context,
 			start, end *types.Header,
-			updateCurrentFunc UpdateCurrentFunc,
+			_ UpdateCurrentFunc,
 			endIterFunc EndIterFunc,
 		) error {
 			s.Equal(lastEnd.Uint64(), start.Number.Uint64())
@@ -163,9 +163,9 @@ func (s *BlockBatchIteratorTestSuite) TestBlockBatchIteratorConfig() {
 	_, err6 := NewBlockBatchIterator(context.Background(), &BlockBatchIteratorConfig{
 		Client: s.RPCClient.L1,
 		OnBlocks: func(
-			ctx context.Context,
+			_ context.Context,
 			start, end *types.Header,
-			updateCurrentFunc UpdateCurrentFunc,
+			_ UpdateCurrentFunc,
 			endIterFunc EndIterFunc,
 		) error {
 			s.Equal(lastEnd.Uint64(), start.Number.Uint64())
@@ -181,9 +181,9 @@ func (s *BlockBatchIteratorTestSuite) TestBlockBatchIteratorConfig() {
 	_, err7 := NewBlockBatchIterator(context.Background(), &BlockBatchIteratorConfig{
 		Client: s.RPCClient.L1,
 		OnBlocks: func(
-			ctx context.Context,
+			_ context.Context,
 			start, end *types.Header,
-			updateCurrentFunc UpdateCurrentFunc,
+			_ UpdateCurrentFunc,
 			endIterFunc EndIterFunc,
 		) error {
 			s.Equal(lastEnd.Uint64(), start.Number.Uint64())
diff --git a/pkg/rpc/methods.go b/pkg/rpc/methods.go
@@ -519,7 +519,6 @@ func (c *Client) checkSyncedL1SnippetFromAnchor(
 	}
 
 	l1BlockHash, l1StateRoot, l1HeightInAnchor, parentGasUsed, err := c.getSyncedL1SnippetFromAnchor(
-		ctx,
 		block.Transactions()[0],
 	)
 	if err != nil {
@@ -576,7 +575,6 @@ func (c *Client) checkSyncedL1SnippetFromAnchor(
 
 // getSyncedL1SnippetFromAnchor parses the anchor transaction calldata, and returns the synced L1 snippet,
 func (c *Client) getSyncedL1SnippetFromAnchor(
-	ctx context.Context,
 	tx *types.Transaction,
 ) (
 	l1BlockHash common.Hash,
diff --git a/pkg/rpc/methods_test.go b/pkg/rpc/methods_test.go
@@ -104,7 +104,7 @@ func TestGetSyncedL1SnippetFromAnchor(t *testing.T) {
 		syncedL1StateRoot,
 		syncedL1Height,
 		syncedParentGasUsed,
-		err := client.getSyncedL1SnippetFromAnchor(context.Background(), tx)
+		err := client.getSyncedL1SnippetFromAnchor(tx)
 	require.Nil(t, err)
 	require.Equal(t, l1BlockHash, syncedL1BlockHash)
 	require.Equal(t, l1StateRoot, syncedL1StateRoot)
diff --git a/pkg/rpc/subscription_test.go b/pkg/rpc/subscription_test.go
@@ -11,8 +11,8 @@ import (
 )
 
 func TestSubscribeEvent(t *testing.T) {
-	require.NotNil(t, SubscribeEvent("test", func(ctx context.Context) (event.Subscription, error) {
-		return event.NewSubscription(func(c <-chan struct{}) error { return nil }), nil
+	require.NotNil(t, SubscribeEvent("test", func(_ context.Context) (event.Subscription, error) {
+		return event.NewSubscription(func(_ <-chan struct{}) error { return nil }), nil
 	}))
 }
 
diff --git a/proposer/proposer.go b/proposer/proposer.go
@@ -201,7 +201,7 @@ func (p *Proposer) eventLoop() {
 }
 
 // Close closes the proposer instance.
-func (p *Proposer) Close(ctx context.Context) {
+func (p *Proposer) Close(_ context.Context) {
 	p.sender.Close()
 	p.wg.Wait()
 }
diff --git a/proposer/prover_selector/eth_fee_eoa_selector.go b/proposer/prover_selector/eth_fee_eoa_selector.go
@@ -9,7 +9,6 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
@@ -89,15 +88,6 @@ func (s *ETHFeeEOASelector) AssignProver(
 	tierFees []encoding.TierFee,
 	txListHash common.Hash,
 ) (*encoding.ProverAssignment, common.Address, *big.Int, error) {
-	guardianProverAddress, err := s.rpc.TaikoL1.Resolve0(
-		&bind.CallOpts{Context: ctx},
-		rpc.StringToBytes32("guardian"),
-		true,
-	)
-	if err != nil {
-		return nil, common.Address{}, nil, err
-	}
-
 	var (
 		expiry       = uint64(time.Now().Add(s.proposalExpiry).Unix())
 		fees         = make([]encoding.TierFee, len(tierFees))
@@ -133,7 +123,6 @@ func (s *ETHFeeEOASelector) AssignProver(
 				s.assignmentHookAddress,
 				txListHash,
 				s.requestTimeout,
-				guardianProverAddress,
 			)
 			if err != nil {
 				log.Warn("Failed to assign prover", "endpoint", endpoint, "error", err)
@@ -185,7 +174,6 @@ func assignProver(
 	assignmentHookAddress common.Address,
 	txListHash common.Hash,
 	timeout time.Duration,
-	guardianProverAddress common.Address,
 ) (*encoding.ProverAssignment, common.Address, error) {
 	log.Info(
 		"Attempting to assign prover",
diff --git a/prover/anchor_tx_validator/anchor_tx_validator.go b/prover/anchor_tx_validator/anchor_tx_validator.go
@@ -31,8 +31,8 @@ func New(taikoL2Address common.Address, chainID *big.Int, rpc *rpc.Client) (*Anc
 	return &AnchorTxValidator{taikoL2Address, goldenTouchAddress, chainID, rpc}, nil
 }
 
-// validateAnchorTx checks whether the given transaction is a valid `TaikoL2.anchor` transaction.
-func (v *AnchorTxValidator) ValidateAnchorTx(ctx context.Context, tx *types.Transaction) error {
+// ValidateAnchorTx checks whether the given transaction is a valid `TaikoL2.anchor` transaction.
+func (v *AnchorTxValidator) ValidateAnchorTx(tx *types.Transaction) error {
 	if tx.To() == nil || *tx.To() != v.taikoL2Address {
 		return fmt.Errorf("invalid TaikoL2.anchor transaction to: %s, want: %s", tx.To(), v.taikoL2Address)
 	}
diff --git a/prover/anchor_tx_validator/anchor_tx_validator_test.go b/prover/anchor_tx_validator/anchor_tx_validator_test.go
@@ -40,7 +40,7 @@ func (s *AnchorTxValidatorTestSuite) TestValidateAnchorTx() {
 		0,
 		common.BytesToAddress(testutils.RandomBytes(1024)), common.Big0, 0, common.Big0, []byte{},
 	)
-	s.ErrorContains(s.v.ValidateAnchorTx(context.Background(), tx), "invalid TaikoL2.anchor transaction to")
+	s.ErrorContains(s.v.ValidateAnchorTx(tx), "invalid TaikoL2.anchor transaction to")
 
 	// invalid sender
 	dynamicFeeTxTx := &types.DynamicFeeTx{
@@ -59,12 +59,12 @@ func (s *AnchorTxValidatorTestSuite) TestValidateAnchorTx() {
 	tx = types.MustSignNewTx(wrongPrivKey, signer, dynamicFeeTxTx)
 
 	s.ErrorContains(
-		s.v.ValidateAnchorTx(context.Background(), tx), "invalid TaikoL2.anchor transaction sender",
+		s.v.ValidateAnchorTx(tx), "invalid TaikoL2.anchor transaction sender",
 	)
 
 	// invalid method selector
 	tx = types.MustSignNewTx(goldenTouchPriKey, signer, dynamicFeeTxTx)
-	s.ErrorContains(s.v.ValidateAnchorTx(context.Background(), tx), "invalid TaikoL2.anchor transaction selector")
+	s.ErrorContains(s.v.ValidateAnchorTx(tx), "invalid TaikoL2.anchor transaction selector")
 }
 
 func (s *AnchorTxValidatorTestSuite) TestGetAndValidateAnchorTxReceipt() {
diff --git a/prover/event_handler/util.go b/prover/event_handler/util.go
@@ -85,9 +85,9 @@ func getBlockProposedEventFromBlockID(
 	proposedIn *big.Int,
 ) (e *bindings.TaikoL1ClientBlockProposed, err error) {
 	callback := func(
-		ctx context.Context,
+		_ context.Context,
 		event *bindings.TaikoL1ClientBlockProposed,
-		end eventIterator.EndBlockProposedEventIterFunc,
+		_ eventIterator.EndBlockProposedEventIterFunc,
 	) error {
 		// Only filter for exact blockID we want.
 		if event.BlockId.Cmp(id) != 0 {
diff --git a/prover/init.go b/prover/init.go
@@ -100,7 +100,6 @@ func (p *Prover) setApprovalAmount(ctx context.Context, contract common.Address)
 
 // initProofSubmitters initializes the proof submitters from the given tiers in protocol.
 func (p *Prover) initProofSubmitters(
-	ctx context.Context,
 	sender *sender.Sender,
 	txBuilder *transaction.ProveBlockTxBuilder,
 ) error {
@@ -132,7 +131,6 @@ func (p *Prover) initProofSubmitters(
 		}
 
 		if submitter, err = proofSubmitter.New(
-			ctx,
 			p.rpc,
 			producer,
 			p.proofGenerationCh,
diff --git a/prover/proof_producer/dummy_producer.go b/prover/proof_producer/dummy_producer.go
@@ -2,7 +2,6 @@ package producer
 
 import (
 	"bytes"
-	"context"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/core/types"
@@ -15,7 +14,6 @@ type DummyProofProducer struct{}
 
 // RequestProof returns a dummy proof to the result channel.
 func (o *DummyProofProducer) RequestProof(
-	ctx context.Context,
 	opts *ProofRequestOptions,
 	blockID *big.Int,
 	meta *bindings.TaikoDataBlockMetadata,
diff --git a/prover/proof_producer/dummy_producer_test.go b/prover/proof_producer/dummy_producer_test.go
@@ -1,7 +1,6 @@
 package producer
 
 import (
-	"context"
 	"testing"
 	"time"
 
@@ -36,7 +35,6 @@ func TestDummyProducerRequestProof(t *testing.T) {
 		blockID         = common.Big32
 	)
 	res, err := producer.RequestProof(
-		context.Background(),
 		&ProofRequestOptions{},
 		blockID,
 		&bindings.TaikoDataBlockMetadata{},
diff --git a/prover/proof_producer/guardian_producer.go b/prover/proof_producer/guardian_producer.go
@@ -32,7 +32,7 @@ func NewGuardianProofProducer(returnLivenessBond bool) *GuardianProofProducer {
 
 // RequestProof implements the ProofProducer interface.
 func (g *GuardianProofProducer) RequestProof(
-	ctx context.Context,
+	_ context.Context,
 	opts *ProofRequestOptions,
 	blockID *big.Int,
 	meta *bindings.TaikoDataBlockMetadata,
@@ -57,7 +57,7 @@ func (g *GuardianProofProducer) RequestProof(
 		}, nil
 	}
 
-	return g.DummyProofProducer.RequestProof(ctx, opts, blockID, meta, header, g.Tier())
+	return g.DummyProofProducer.RequestProof(opts, blockID, meta, header, g.Tier())
 }
 
 // Tier implements the ProofProducer interface.
@@ -69,8 +69,3 @@ func (g *GuardianProofProducer) Tier() uint16 {
 func (g *GuardianProofProducer) Cancellable() bool {
 	return false
 }
-
-// Cancel cancels an existing proof generation.
-func (g *GuardianProofProducer) Cancel(ctx context.Context, blockID *big.Int) error {
-	return nil
-}
diff --git a/prover/proof_producer/optimistic_producer.go b/prover/proof_producer/optimistic_producer.go
@@ -16,7 +16,7 @@ type OptimisticProofProducer struct{ *DummyProofProducer }
 
 // RequestProof implements the ProofProducer interface.
 func (o *OptimisticProofProducer) RequestProof(
-	ctx context.Context,
+	_ context.Context,
 	opts *ProofRequestOptions,
 	blockID *big.Int,
 	meta *bindings.TaikoDataBlockMetadata,
@@ -30,7 +30,7 @@ func (o *OptimisticProofProducer) RequestProof(
 		"hash", header.Hash(),
 	)
 
-	return o.DummyProofProducer.RequestProof(ctx, opts, blockID, meta, header, o.Tier())
+	return o.DummyProofProducer.RequestProof(opts, blockID, meta, header, o.Tier())
 }
 
 // Tier implements the ProofProducer interface.
@@ -42,8 +42,3 @@ func (o *OptimisticProofProducer) Tier() uint16 {
 func (o *OptimisticProofProducer) Cancellable() bool {
 	return false
 }
-
-// Cancel cancels an existing proof generation.
-func (o *OptimisticProofProducer) Cancel(ctx context.Context, blockID *big.Int) error {
-	return nil
-}
diff --git a/prover/proof_producer/optimistic_producer_test.go b/prover/proof_producer/optimistic_producer_test.go
@@ -82,9 +82,6 @@ func TestProofCancel(t *testing.T) {
 		header,
 	)
 	require.Nil(t, err)
-
-	// Cancel the proof request, should return nil
-	require.Nil(t, optimisticProofProducer.Cancel(context.Background(), blockID))
 }
 
 func randHash() common.Hash {
diff --git a/prover/proof_producer/proof_producer.go b/prover/proof_producer/proof_producer.go
@@ -66,6 +66,5 @@ type ProofProducer interface {
 		header *types.Header,
 	) (*ProofWithHeader, error)
 	Cancellable() bool
-	Cancel(ctx context.Context, blockID *big.Int) error
 	Tier() uint16
 }
diff --git a/prover/proof_producer/sgx_producer.go b/prover/proof_producer/sgx_producer.go
@@ -98,7 +98,7 @@ func (s *SGXProofProducer) RequestProof(
 	)
 
 	if s.DummyProofProducer != nil {
-		return s.DummyProofProducer.RequestProof(ctx, opts, blockID, meta, header, s.Tier())
+		return s.DummyProofProducer.RequestProof(opts, blockID, meta, header, s.Tier())
 	}
 
 	proof, err := s.callProverDaemon(ctx, opts)
@@ -219,10 +219,3 @@ func (s *SGXProofProducer) Tier() uint16 {
 func (s *SGXProofProducer) Cancellable() bool {
 	return false
 }
-
-// Cancel cancels an existing proof generation.
-//
-//nolint:golint
-func (s *SGXProofProducer) Cancel(ctx context.Context, blockID *big.Int) error {
-	return nil
-}
diff --git a/prover/proof_submitter/proof_contester.go b/prover/proof_submitter/proof_contester.go
diff --git a/prover/proof_submitter/proof_submitter.go b/prover/proof_submitter/proof_submitter.go
diff --git a/prover/proof_submitter/proof_submitter_test.go b/prover/proof_submitter/proof_submitter_test.go
diff --git a/prover/proof_submitter/transaction/builder.go b/prover/proof_submitter/transaction/builder.go
diff --git a/prover/proof_submitter/transaction/sender.go b/prover/proof_submitter/transaction/sender.go
diff --git a/prover/proof_submitter/transaction/sender_test.go b/prover/proof_submitter/transaction/sender_test.go
diff --git a/prover/prover.go b/prover/prover.go

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (d *Driver) Start() error {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// Close closes the driver instance.`
`104`		`-func (d *Driver) Close(ctx context.Context) {`
	`104`	`+func (d *Driver) Close(_ context.Context) {`
`105`	`105`	`d.l1HeadSub.Unsubscribe()`
`106`	`106`	`d.state.Close()`
`107`	`107`	`d.wg.Wait()`
Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,6 @@ func (c *Client) checkSyncedL1SnippetFromAnchor(`
`519`	`519`	`}`
`520`	`520`
`521`	`521`	`l1BlockHash, l1StateRoot, l1HeightInAnchor, parentGasUsed, err := c.getSyncedL1SnippetFromAnchor(`
`522`		`- ctx,`
`523`	`522`	`block.Transactions()[0],`
`524`	`523`	`)`
`525`	`524`	`if err != nil {`
`@@ -576,7 +575,6 @@ func (c *Client) checkSyncedL1SnippetFromAnchor(`
`576`	`575`
`577`	`576`	`// getSyncedL1SnippetFromAnchor parses the anchor transaction calldata, and returns the synced L1 snippet,`
`578`	`577`	`func (c *Client) getSyncedL1SnippetFromAnchor(`
`579`		`- ctx context.Context,`
`580`	`578`	`tx *types.Transaction,`
`581`	`579`	`) (`
`582`	`580`	`l1BlockHash common.Hash,`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestSubscribeEvent(t *testing.T) {`
`14`		`- require.NotNil(t, SubscribeEvent("test", func(ctx context.Context) (event.Subscription, error) {`
`15`		`- return event.NewSubscription(func(c <-chan struct{}) error { return nil }), nil`
	`14`	`+ require.NotNil(t, SubscribeEvent("test", func(_ context.Context) (event.Subscription, error) {`
	`15`	`+ return event.NewSubscription(func(_ <-chan struct{}) error { return nil }), nil`
`16`	`16`	`}))`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ func (p *Proposer) eventLoop() {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`// Close closes the proposer instance.`
`204`		`-func (p *Proposer) Close(ctx context.Context) {`
	`204`	`+func (p *Proposer) Close(_ context.Context) {`
`205`	`205`	`p.sender.Close()`
`206`	`206`	`p.wg.Wait()`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ func New(taikoL2Address common.Address, chainID big.Int, rpc rpc.Client) (*Anc`
`31`	`31`	`return &AnchorTxValidator{taikoL2Address, goldenTouchAddress, chainID, rpc}, nil`
`32`	`32`	`}`
`33`	`33`
`34`		-// validateAnchorTx checks whether the given transaction is a valid `TaikoL2.anchor` transaction.
`35`		`-func (v AnchorTxValidator) ValidateAnchorTx(ctx context.Context, tx types.Transaction) error {`
	`34`	+// ValidateAnchorTx checks whether the given transaction is a valid `TaikoL2.anchor` transaction.
	`35`	`+func (v AnchorTxValidator) ValidateAnchorTx(tx types.Transaction) error {`
`36`	`36`	`if tx.To() == nil \|\| *tx.To() != v.taikoL2Address {`
`37`	`37`	`return fmt.Errorf("invalid TaikoL2.anchor transaction to: %s, want: %s", tx.To(), v.taikoL2Address)`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (s *AnchorTxValidatorTestSuite) TestValidateAnchorTx() {`
`40`	`40`	`0,`
`41`	`41`	`common.BytesToAddress(testutils.RandomBytes(1024)), common.Big0, 0, common.Big0, []byte{},`
`42`	`42`	`)`
`43`		`- s.ErrorContains(s.v.ValidateAnchorTx(context.Background(), tx), "invalid TaikoL2.anchor transaction to")`
	`43`	`+ s.ErrorContains(s.v.ValidateAnchorTx(tx), "invalid TaikoL2.anchor transaction to")`
`44`	`44`
`45`	`45`	`// invalid sender`
`46`	`46`	`dynamicFeeTxTx := &types.DynamicFeeTx{`
`@@ -59,12 +59,12 @@ func (s *AnchorTxValidatorTestSuite) TestValidateAnchorTx() {`
`59`	`59`	`tx = types.MustSignNewTx(wrongPrivKey, signer, dynamicFeeTxTx)`
`60`	`60`
`61`	`61`	`s.ErrorContains(`
`62`		`- s.v.ValidateAnchorTx(context.Background(), tx), "invalid TaikoL2.anchor transaction sender",`
	`62`	`+ s.v.ValidateAnchorTx(tx), "invalid TaikoL2.anchor transaction sender",`
`63`	`63`	`)`
`64`	`64`
`65`	`65`	`// invalid method selector`
`66`	`66`	`tx = types.MustSignNewTx(goldenTouchPriKey, signer, dynamicFeeTxTx)`
`67`		`- s.ErrorContains(s.v.ValidateAnchorTx(context.Background(), tx), "invalid TaikoL2.anchor transaction selector")`
	`67`	`+ s.ErrorContains(s.v.ValidateAnchorTx(tx), "invalid TaikoL2.anchor transaction selector")`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`func (s *AnchorTxValidatorTestSuite) TestGetAndValidateAnchorTxReceipt() {`
Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,6 @@ func TestProofCancel(t *testing.T) {`
`82`	`82`	`header,`
`83`	`83`	`)`
`84`	`84`	`require.Nil(t, err)`
`85`		`-`
`86`		`- // Cancel the proof request, should return nil`
`87`		`- require.Nil(t, optimisticProofProducer.Cancel(context.Background(), blockID))`
`88`	`85`	`}`
`89`	`86`
`90`	`87`	`func randHash() common.Hash {`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,5 @@ type ProofProducer interface {`
`66`	`66`	`header *types.Header,`
`67`	`67`	`) (*ProofWithHeader, error)`
`68`	`68`	`Cancellable() bool`
`69`		`- Cancel(ctx context.Context, blockID *big.Int) error`
`70`	`69`	`Tier() uint16`
`71`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func (s *SGXProofProducer) RequestProof(`
`98`	`98`	`)`
`99`	`99`
`100`	`100`	`if s.DummyProofProducer != nil {`
`101`		`- return s.DummyProofProducer.RequestProof(ctx, opts, blockID, meta, header, s.Tier())`
	`101`	`+ return s.DummyProofProducer.RequestProof(opts, blockID, meta, header, s.Tier())`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`proof, err := s.callProverDaemon(ctx, opts)`
`@@ -219,10 +219,3 @@ func (s *SGXProofProducer) Tier() uint16 {`
`219`	`219`	`func (s *SGXProofProducer) Cancellable() bool {`
`220`	`220`	`return false`
`221`	`221`	`}`
`222`		`-`
`223`		`-// Cancel cancels an existing proof generation.`
`224`		`-//`
`225`		`-//nolint:golint`
`226`		`-func (s SGXProofProducer) Cancel(ctx context.Context, blockID big.Int) error {`
`227`		`- return nil`
`228`		`-}`