From 73fa175bd1ee43f9a81c9865f265d36576427eae Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Wed, 9 Sep 2020 15:21:20 +0200 Subject: [PATCH] accounts/abi/bind/backends: reverted some stylistic changes (#21535) # Conflicts: # accounts/abi/bind/backends/simulated.go --- accounts/abi/bind/backends/simulated.go | 34 ++++++++++---------- accounts/abi/bind/backends/simulated_test.go | 6 ++-- to-merge.txt | 21 ------------ 3 files changed, 20 insertions(+), 41 deletions(-) diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 5652daa01..504b9a105 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -262,7 +262,7 @@ func (b *SimulatedBackend) StorageAt(ctx context.Context, contract common.Addres } // TransactionReceipt returns the receipt of a transaction. -func (b *SimulatedBackend) TransactionReceipt(_ context.Context, txHash common.Hash) (*types.Receipt, error) { +func (b *SimulatedBackend) TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error) { b.mu.Lock() defer b.mu.Unlock() @@ -274,7 +274,7 @@ func (b *SimulatedBackend) TransactionReceipt(_ context.Context, txHash common.H // blockchain. The isPending return value indicates whether the transaction has been // mined yet. Note that the transaction may not be part of the canonical chain even if // it's not pending. -func (b *SimulatedBackend) TransactionByHash(_ context.Context, txHash common.Hash) (*types.Transaction, bool, error) { +func (b *SimulatedBackend) TransactionByHash(ctx context.Context, txHash common.Hash) (*types.Transaction, bool, error) { b.mu.Lock() defer b.mu.Unlock() @@ -290,7 +290,7 @@ func (b *SimulatedBackend) TransactionByHash(_ context.Context, txHash common.Ha } // BlockByHash retrieves a block based on the block hash. -func (b *SimulatedBackend) BlockByHash(_ context.Context, hash common.Hash) (*types.Block, error) { +func (b *SimulatedBackend) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error) { b.mu.Lock() defer b.mu.Unlock() @@ -332,7 +332,7 @@ func (b *SimulatedBackend) blockByNumberNoLock(_ context.Context, number *big.In } // HeaderByHash returns a block header from the current canonical chain. -func (b *SimulatedBackend) HeaderByHash(_ context.Context, hash common.Hash) (*types.Header, error) { +func (b *SimulatedBackend) HeaderByHash(ctx context.Context, hash common.Hash) (*types.Header, error) { b.mu.Lock() defer b.mu.Unlock() @@ -367,7 +367,7 @@ func (b *SimulatedBackend) HeaderByNumber(ctx context.Context, number *big.Int) } // TransactionCount returns the number of transactions in a given block. -func (b *SimulatedBackend) TransactionCount(_ context.Context, blockHash common.Hash) (uint, error) { +func (b *SimulatedBackend) TransactionCount(ctx context.Context, blockHash common.Hash) (uint, error) { b.mu.Lock() defer b.mu.Unlock() @@ -384,7 +384,7 @@ func (b *SimulatedBackend) TransactionCount(_ context.Context, blockHash common. } // TransactionInBlock returns the transaction for a specific block at a specific index. -func (b *SimulatedBackend) TransactionInBlock(_ context.Context, blockHash common.Hash, index uint) (*types.Transaction, error) { +func (b *SimulatedBackend) TransactionInBlock(ctx context.Context, blockHash common.Hash, index uint) (*types.Transaction, error) { b.mu.Lock() defer b.mu.Unlock() @@ -411,7 +411,7 @@ func (b *SimulatedBackend) TransactionInBlock(_ context.Context, blockHash commo } // PendingCodeAt returns the code associated with an account in the pending state. -func (b *SimulatedBackend) PendingCodeAt(_ context.Context, contract common.Address) ([]byte, error) { +func (b *SimulatedBackend) PendingCodeAt(ctx context.Context, contract common.Address) ([]byte, error) { b.mu.Lock() defer b.mu.Unlock() @@ -487,7 +487,7 @@ func (b *SimulatedBackend) PendingCallContract(ctx context.Context, call ethereu // PendingNonceAt implements PendingStateReader.PendingNonceAt, retrieving // the nonce currently pending for the account. -func (b *SimulatedBackend) PendingNonceAt(_ context.Context, account common.Address) (uint64, error) { +func (b *SimulatedBackend) PendingNonceAt(ctx context.Context, account common.Address) (uint64, error) { b.mu.Lock() defer b.mu.Unlock() @@ -496,7 +496,7 @@ func (b *SimulatedBackend) PendingNonceAt(_ context.Context, account common.Addr // SuggestGasPrice implements ContractTransactor.SuggestGasPrice. Since the simulated // chain doesn't have miners, we just return a gas price of 1 for any call. -func (b *SimulatedBackend) SuggestGasPrice(_ context.Context) (*big.Int, error) { +func (b *SimulatedBackend) SuggestGasPrice(ctx context.Context) (*big.Int, error) { return big.NewInt(1), nil } @@ -623,7 +623,7 @@ func (b *SimulatedBackend) callContract(_ context.Context, call ethereum.CallMsg // SendTransaction updates the pending block to include the given transaction. // It panics if the transaction is invalid. -func (b *SimulatedBackend) SendTransaction(_ context.Context, tx *types.Transaction) error { +func (b *SimulatedBackend) SendTransaction(ctx context.Context, tx *types.Transaction) error { b.mu.Lock() defer b.mu.Unlock() @@ -699,7 +699,7 @@ func (b *SimulatedBackend) FilterLogs(ctx context.Context, query ethereum.Filter // SubscribeFilterLogs creates a background log filtering operation, returning a // subscription immediately, which can be used to stream the found events. -func (b *SimulatedBackend) SubscribeFilterLogs(_ context.Context, query ethereum.FilterQuery, ch chan<- types.Log) (ethereum.Subscription, error) { +func (b *SimulatedBackend) SubscribeFilterLogs(ctx context.Context, query ethereum.FilterQuery, ch chan<- types.Log) (ethereum.Subscription, error) { // Subscribe to contract events sink := make(chan []*types.Log) @@ -732,7 +732,7 @@ func (b *SimulatedBackend) SubscribeFilterLogs(_ context.Context, query ethereum } // SubscribeNewHead returns an event subscription for a new header. -func (b *SimulatedBackend) SubscribeNewHead(_ context.Context, ch chan<- *types.Header) (ethereum.Subscription, error) { +func (b *SimulatedBackend) SubscribeNewHead(ctx context.Context, ch chan<- *types.Header) (ethereum.Subscription, error) { // subscribe to a new head sink := make(chan *types.Header) sub := b.events.SubscribeNewHeads(sink) @@ -823,7 +823,7 @@ func (fb *filterBackend) HeaderByHash(ctx context.Context, hash common.Hash) (*t return fb.b.HeaderByHash(ctx, hash) } -func (fb *filterBackend) GetReceipts(_ context.Context, hash common.Hash) (types.Receipts, error) { +func (fb *filterBackend) GetReceipts(ctx context.Context, hash common.Hash) (types.Receipts, error) { number := rawdb.ReadHeaderNumber(fb.db, hash) if number == nil { return nil, nil @@ -831,7 +831,7 @@ func (fb *filterBackend) GetReceipts(_ context.Context, hash common.Hash) (types return rawdb.ReadReceipts(fb.db, hash, *number), nil } -func (fb *filterBackend) GetLogs(_ context.Context, hash common.Hash) ([][]*types.Log, error) { +func (fb *filterBackend) GetLogs(ctx context.Context, hash common.Hash) ([][]*types.Log, error) { number := rawdb.ReadHeaderNumber(fb.db, hash) if number == nil { return nil, nil @@ -847,7 +847,7 @@ func (fb *filterBackend) GetLogs(_ context.Context, hash common.Hash) ([][]*type return logs, nil } -func (fb *filterBackend) SubscribeNewTxsEvent(_ chan<- core.NewTxsEvent) event.Subscription { +func (fb *filterBackend) SubscribeNewTxsEvent(ch chan<- core.NewTxsEvent) event.Subscription { return nullSubscription() } @@ -863,13 +863,13 @@ func (fb *filterBackend) SubscribeLogsEvent(ch chan<- []*types.Log) event.Subscr return fb.b.logsFeed.Subscribe(ch) } -func (fb *filterBackend) SubscribePendingLogsEvent(_ chan<- []*types.Log) event.Subscription { +func (fb *filterBackend) SubscribePendingLogsEvent(ch chan<- []*types.Log) event.Subscription { return nullSubscription() } func (fb *filterBackend) BloomStatus() (uint64, uint64) { return 4096, 0 } -func (fb *filterBackend) ServiceFilter(_ context.Context, _ *bloombits.MatcherSession) { +func (fb *filterBackend) ServiceFilter(ctx context.Context, ms *bloombits.MatcherSession) { panic("not supported") } diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go index f205f8aa1..0527890eb 100644 --- a/accounts/abi/bind/backends/simulated_test.go +++ b/accounts/abi/bind/backends/simulated_test.go @@ -1095,12 +1095,12 @@ func TestSimulatedBackend_CallContractRevert(t *testing.T) { t.Errorf("result from %v was not nil: %v", key, res) } if val != nil { - rErr, ok := err.(*revertError) + rerr, ok := err.(*revertError) if !ok { t.Errorf("expect revert error") } - if rErr.Error() != "execution reverted: "+val.(string) { - t.Errorf("error was malformed: got %v want %v", rErr.Error(), val) + if rerr.Error() != "execution reverted: "+val.(string) { + t.Errorf("error was malformed: got %v want %v", rerr.Error(), val) } } else { // revert(0x0,0x0) diff --git a/to-merge.txt b/to-merge.txt index faccb31d5..a12cdb293 100644 --- a/to-merge.txt +++ b/to-merge.txt @@ -463,24 +463,3 @@ Date: Wed Sep 9 23:38:47 2020 +0800 * eth: rename default price cap -commit 3a98c6f6e6613f8fe5380971fd113917c7b1ed37 -Merge: d81c9d9b7 367f12f73 -Author: Péter Szilágyi -Date: Wed Sep 9 18:37:37 2020 +0300 - - Merge pull request #21537 from karalabe/les-reorg-fix - - eth/downloader: only roll back light sync if not fully validating - -commit d81c9d9b76f4255a258c1a6d93b3392ac0e8fd5f -Author: Marius van der Wijden -Date: Wed Sep 9 15:21:20 2020 +0200 - - accounts/abi/bind/backends: reverted some stylistic changes (#21535) - -commit 367f12f73495b30c17c7d358cf71575f34f79757 -Author: Péter Szilágyi -Date: Wed Sep 9 14:06:32 2020 +0300 - - eth/downloader: only roll back light sync if not fully validating -