interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14913 from egonelbre/megacheck_common 

common: fix megacheck warnings
This commit is contained in:
Péter Szilágyi 2017-08-07 14:16:55 +03:00 committed by GitHub
parent 7c74e166b0 392151e251
commit fc0c6c175c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/bitutil/compress_test.go
View File

@ -121,20 +121,20 @@ func TestCompression(t *testing.T) {
in := hexutil.MustDecode("0x4912385c0e7b64000000") in := hexutil.MustDecode("0x4912385c0e7b64000000")
out := hexutil.MustDecode("0x80fe4912385c0e7b64") out := hexutil.MustDecode("0x80fe4912385c0e7b64")
if data := CompressBytes(in); bytes.Compare(data, out) != 0 { if data := CompressBytes(in); !bytes.Equal(data, out) {
t.Errorf("encoding mismatch for sparse data: have %x, want %x", data, out) t.Errorf("encoding mismatch for sparse data: have %x, want %x", data, out)
} }
if data, err := DecompressBytes(out, len(in)); err != nil || bytes.Compare(data, in) != 0 { if data, err := DecompressBytes(out, len(in)); err != nil || !bytes.Equal(data, in) {
t.Errorf("decoding mismatch for sparse data: have %x, want %x, error %v", data, in, err) t.Errorf("decoding mismatch for sparse data: have %x, want %x, error %v", data, in, err)
} }
// Check the the compression returns the input if the bitset encoding is longer // Check the the compression returns the input if the bitset encoding is longer
in = hexutil.MustDecode("0xdf7070533534333636313639343638373532313536346c1bc33339343837313070706336343035336336346c65fefb3930393233383838ac2f65fefb") in = hexutil.MustDecode("0xdf7070533534333636313639343638373532313536346c1bc33339343837313070706336343035336336346c65fefb3930393233383838ac2f65fefb")
out = hexutil.MustDecode("0xdf7070533534333636313639343638373532313536346c1bc33339343837313070706336343035336336346c65fefb3930393233383838ac2f65fefb") out = hexutil.MustDecode("0xdf7070533534333636313639343638373532313536346c1bc33339343837313070706336343035336336346c65fefb3930393233383838ac2f65fefb")
if data := CompressBytes(in); bytes.Compare(data, out) != 0 { if data := CompressBytes(in); !bytes.Equal(data, out) {
t.Errorf("encoding mismatch for dense data: have %x, want %x", data, out) t.Errorf("encoding mismatch for dense data: have %x, want %x", data, out)
} }
if data, err := DecompressBytes(out, len(in)); err != nil || bytes.Compare(data, in) != 0 { if data, err := DecompressBytes(out, len(in)); err != nil || !bytes.Equal(data, in) {
t.Errorf("decoding mismatch for dense data: have %x, want %x, error %v", data, in, err) t.Errorf("decoding mismatch for dense data: have %x, want %x, error %v", data, in, err)
} }
// Check that decompressing a longer input than the target fails // Check that decompressing a longer input than the target fails

1
common/hexutil/json.go
View File

@ -26,7 +26,6 @@ import (
) )
var ( var (
textZero = []byte(`0x0`)
bytesT = reflect.TypeOf(Bytes(nil)) bytesT = reflect.TypeOf(Bytes(nil))
bigT = reflect.TypeOf((*Big)(nil)) bigT = reflect.TypeOf((*Big)(nil))
uintT = reflect.TypeOf(Uint(0)) uintT = reflect.TypeOf(Uint(0))