tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: golint fixes for tests directory (#16640)

Browse Source
This commit is contained in:
Eli 2018-05-02 01:20:19 -07:00 committed by Péter Szilágyi
parent c1ea527573
commit d76c5ca532
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/block_test_util.go
View File

@ -104,7 +104,7 @@ func (t *BlockTest) Run() error {
return err return err
} }
if gblock.Hash() != t.json.Genesis.Hash { if gblock.Hash() != t.json.Genesis.Hash {
return fmt.Errorf("genesis block hash doesn't match test: computed=%x, test=%x\n", gblock.Hash().Bytes()[:6], t.json.Genesis.Hash[:6]) return fmt.Errorf("genesis block hash doesn't match test: computed=%x, test=%x", gblock.Hash().Bytes()[:6], t.json.Genesis.Hash[:6])
} }
if gblock.Root() != t.json.Genesis.StateRoot { if gblock.Root() != t.json.Genesis.StateRoot {
return fmt.Errorf("genesis block state root does not match test: computed=%x, test=%x", gblock.Root().Bytes()[:6], t.json.Genesis.StateRoot[:6]) return fmt.Errorf("genesis block state root does not match test: computed=%x, test=%x", gblock.Root().Bytes()[:6], t.json.Genesis.StateRoot[:6])

2
tests/init.go
View File

@ -23,7 +23,7 @@ import (
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
) )
// This table defines supported forks and their chain config. // Forks table defines supported forks and their chain config.
var Forks = map[string]*params.ChainConfig{ var Forks = map[string]*params.ChainConfig{
"Frontier": { "Frontier": {
ChainId: big.NewInt(1), ChainId: big.NewInt(1),

11
tests/init_test.go
View File

@ -42,7 +42,7 @@ var (
difficultyTestDir = filepath.Join(baseDir, "BasicTests") difficultyTestDir = filepath.Join(baseDir, "BasicTests")
) )
func readJson(reader io.Reader, value interface{}) error { func readJSON(reader io.Reader, value interface{}) error {
data, err := ioutil.ReadAll(reader) data, err := ioutil.ReadAll(reader)
if err != nil { if err != nil {
return fmt.Errorf("error reading JSON file: %v", err) return fmt.Errorf("error reading JSON file: %v", err)
@ -57,14 +57,14 @@ func readJson(reader io.Reader, value interface{}) error {
return nil return nil
} }
func readJsonFile(fn string, value interface{}) error { func readJSONFile(fn string, value interface{}) error {
file, err := os.Open(fn) file, err := os.Open(fn)
if err != nil { if err != nil {
return err return err
} }
defer file.Close() defer file.Close()
err = readJson(file, value) err = readJSON(file, value)
if err != nil { if err != nil {
return fmt.Errorf("%s in file %s", err.Error(), fn) return fmt.Errorf("%s in file %s", err.Error(), fn)
} }
@ -169,9 +169,8 @@ func (tm *testMatcher) checkFailure(t *testing.T, name string, err error) error
if err != nil { if err != nil {
t.Logf("error: %v", err) t.Logf("error: %v", err)
return nil return nil
} else {
return fmt.Errorf("test succeeded unexpectedly")
} }
return fmt.Errorf("test succeeded unexpectedly")
} }
return err return err
} }
@ -213,7 +212,7 @@ func (tm *testMatcher) runTestFile(t *testing.T, path, name string, runTest inte
// Load the file as map[string]<testType>. // Load the file as map[string]<testType>.
m := makeMapFromTestFunc(runTest) m := makeMapFromTestFunc(runTest)
if err := readJsonFile(path, m.Addr().Interface()); err != nil { if err := readJSONFile(path, m.Addr().Interface()); err != nil {
t.Fatal(err) t.Fatal(err)
} }

3
tests/transaction_test_util.go
View File

@ -72,9 +72,8 @@ func (tt *TransactionTest) Run(config *params.ChainConfig) error {
if err := rlp.DecodeBytes(tt.json.RLP, tx); err != nil { if err := rlp.DecodeBytes(tt.json.RLP, tx); err != nil {
if tt.json.Transaction == nil { if tt.json.Transaction == nil {
return nil return nil
} else {
return fmt.Errorf("RLP decoding failed: %v", err)
} }
return fmt.Errorf("RLP decoding failed: %v", err)
} }
// Check sender derivation. // Check sender derivation.
signer := types.MakeSigner(config, new(big.Int).SetUint64(uint64(tt.json.BlockNumber))) signer := types.MakeSigner(config, new(big.Int).SetUint64(uint64(tt.json.BlockNumber)))