diff options
author | Felix Lange <fjl@twurst.com> | 2016-04-15 17:06:57 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2016-04-15 17:17:27 +0800 |
commit | 6fdd0893c3ebf57e5a9ba2af569c595c859ab902 (patch) | |
tree | 2df67265a0350b68b2f10ba2f7dcd292fef59ad0 /eth/filters | |
parent | 68c755a238f1a204087c2843f01d48fc6039716f (diff) | |
download | go-tangerine-6fdd0893c3ebf57e5a9ba2af569c595c859ab902.tar go-tangerine-6fdd0893c3ebf57e5a9ba2af569c595c859ab902.tar.gz go-tangerine-6fdd0893c3ebf57e5a9ba2af569c595c859ab902.tar.bz2 go-tangerine-6fdd0893c3ebf57e5a9ba2af569c595c859ab902.tar.lz go-tangerine-6fdd0893c3ebf57e5a9ba2af569c595c859ab902.tar.xz go-tangerine-6fdd0893c3ebf57e5a9ba2af569c595c859ab902.tar.zst go-tangerine-6fdd0893c3ebf57e5a9ba2af569c595c859ab902.zip |
all: fix go vet warnings
Diffstat (limited to 'eth/filters')
-rw-r--r-- | eth/filters/api.go | 8 | ||||
-rw-r--r-- | eth/filters/filter_system_test.go | 4 | ||||
-rw-r--r-- | eth/filters/filter_test.go | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/eth/filters/api.go b/eth/filters/api.go index 54336aaf9..9e95ebd83 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -331,7 +331,7 @@ func (args *NewFilterArgs) UnmarshalJSON(data []byte) error { if decAddr, err := hex.DecodeString(strAddr); err == nil { addresses = append(addresses, common.BytesToAddress(decAddr)) } else { - fmt.Errorf("invalid address given") + return fmt.Errorf("invalid address given") } } else { return fmt.Errorf("invalid address on index %d", i) @@ -344,10 +344,10 @@ func (args *NewFilterArgs) UnmarshalJSON(data []byte) error { if decAddr, err := hex.DecodeString(singleAddr); err == nil { addresses = append(addresses, common.BytesToAddress(decAddr)) } else { - fmt.Errorf("invalid address given") + return fmt.Errorf("invalid address given") } } else { - errors.New("invalid address(es) given") + return errors.New("invalid address(es) given") } args.Addresses = addresses } @@ -394,7 +394,7 @@ func (args *NewFilterArgs) UnmarshalJSON(data []byte) error { parsedTopics[i] = []common.Hash{t} } } else { - fmt.Errorf("topic[%d][%d] not a string", i, j) + return fmt.Errorf("topic[%d][%d] not a string", i, j) } } } else { diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index 7757fb84e..72824cb08 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -76,8 +76,8 @@ func TestCallbacks(t *testing.T) { mux.Post(core.ChainEvent{}) mux.Post(core.TxPreEvent{}) mux.Post(vm.Logs{&vm.Log{}}) - mux.Post(core.RemovedLogsEvent{vm.Logs{&vm.Log{}}}) - mux.Post(core.PendingLogsEvent{vm.Logs{&vm.Log{}}}) + mux.Post(core.RemovedLogsEvent{Logs: vm.Logs{&vm.Log{}}}) + mux.Post(core.PendingLogsEvent{Logs: vm.Logs{&vm.Log{}}}) const dura = 5 * time.Second failTimer := time.NewTimer(dura) diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 5954ea4c1..b0f88ffeb 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -56,7 +56,7 @@ func BenchmarkMipmaps(b *testing.B) { ) defer db.Close() - genesis := core.WriteGenesisBlockForTesting(db, core.GenesisAccount{addr1, big.NewInt(1000000)}) + genesis := core.WriteGenesisBlockForTesting(db, core.GenesisAccount{Address: addr1, Balance: big.NewInt(1000000)}) chain, receipts := core.GenerateChain(genesis, db, 100010, func(i int, gen *core.BlockGen) { var receipts types.Receipts switch i { @@ -132,7 +132,7 @@ func TestFilters(t *testing.T) { ) defer db.Close() - genesis := core.WriteGenesisBlockForTesting(db, core.GenesisAccount{addr, big.NewInt(1000000)}) + genesis := core.WriteGenesisBlockForTesting(db, core.GenesisAccount{Address: addr, Balance: big.NewInt(1000000)}) chain, receipts := core.GenerateChain(genesis, db, 1000, func(i int, gen *core.BlockGen) { var receipts types.Receipts switch i { |