gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

all: fix issues reported by honnef.co/go/simple/cmd/gosimple

Browse Source
This commit is contained in:
Felix Lange
2017-01-06 16:44:20 +01:00
parent 35a7dcb162
commit f2da6581ba
46 changed files with 99 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/block_test_util.go
View File

@ -552,9 +552,7 @@ func LoadBlockTests(file string) (map[string]*BlockTest, error) {
// Nothing to see here, please move along...
func prepInt(base int, s string) string {
if base == 16 {
if strings.HasPrefix(s, "0x") {
s = s[2:]
}
s = strings.TrimPrefix(s, "0x")
if len(s) == 0 {
s = "00"
}

6
tests/init.go
View File

@ -87,11 +87,7 @@ func readJsonHttp(uri string, value interface{}) error {
}
defer resp.Body.Close()
err = readJson(resp.Body, value)
if err != nil {
return err
}
return nil
return readJson(resp.Body, value)
}
func readJsonFile(fn string, value interface{}) error {

2
tests/state_test_util.go
View File

@ -159,7 +159,7 @@ func runStateTest(chainConfig *params.ChainConfig, test VmTest) error {
} else {
rexp = common.FromHex(test.Out)
}
if bytes.Compare(rexp, ret) != 0 {
if !bytes.Equal(rexp, ret) {
return fmt.Errorf("return failed. Expected %x, got %x\n", rexp, ret)
}

2
tests/vm_test_util.go
View File

@ -172,7 +172,7 @@ func runVmTest(test VmTest) error {
// Compare expected and actual return
rexp := common.FromHex(test.Out)
if bytes.Compare(rexp, ret) != 0 {
if !bytes.Equal(rexp, ret) {
return fmt.Errorf("return failed. Expected %x, got %x\n", rexp, ret)
}