mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-12 15:03:45 +00:00
account/abi: fix up rest of tests to hex
Signed-off-by: RJ Catalano <rj@monax.io>
This commit is contained in:
RJ Catalano
parent
a53d00fdd8
commit
27defc9d43
2 changed files with 34 additions and 34 deletions
|
|
@ -409,25 +409,25 @@ func TestPackNumber(t *testing.T) {
|
||||||
packed []byte
|
packed []byte
|
||||||
}{
|
}{
|
||||||
// Protocol limits
|
// Protocol limits
|
||||||
{reflect.ValueOf(0), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
|
{reflect.ValueOf(0), common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000000")},
|
||||||
{reflect.ValueOf(1), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}},
|
{reflect.ValueOf(1), common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001")},
|
||||||
{reflect.ValueOf(-1), []byte{255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}},
|
{reflect.ValueOf(-1), common.Hex2Bytes("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")},
|
||||||
|
|
||||||
// Type corner cases
|
// Type corner cases
|
||||||
{reflect.ValueOf(uint8(math.MaxUint8)), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255}},
|
{reflect.ValueOf(uint8(math.MaxUint8)), common.Hex2Bytes("00000000000000000000000000000000000000000000000000000000000000ff")},
|
||||||
{reflect.ValueOf(uint16(math.MaxUint16)), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255}},
|
{reflect.ValueOf(uint16(math.MaxUint16)), common.Hex2Bytes("000000000000000000000000000000000000000000000000000000000000ffff")},
|
||||||
{reflect.ValueOf(uint32(math.MaxUint32)), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255}},
|
{reflect.ValueOf(uint32(math.MaxUint32)), common.Hex2Bytes("00000000000000000000000000000000000000000000000000000000ffffffff")},
|
||||||
{reflect.ValueOf(uint64(math.MaxUint64)), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255}},
|
{reflect.ValueOf(uint64(math.MaxUint64)), common.Hex2Bytes("000000000000000000000000000000000000000000000000ffffffffffffffff")},
|
||||||
|
|
||||||
{reflect.ValueOf(int8(math.MaxInt8)), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127}},
|
{reflect.ValueOf(int8(math.MaxInt8)), common.Hex2Bytes("000000000000000000000000000000000000000000000000000000000000007f")},
|
||||||
{reflect.ValueOf(int16(math.MaxInt16)), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 255}},
|
{reflect.ValueOf(int16(math.MaxInt16)), common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000007fff")},
|
||||||
{reflect.ValueOf(int32(math.MaxInt32)), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 255, 255, 255}},
|
{reflect.ValueOf(int32(math.MaxInt32)), common.Hex2Bytes("000000000000000000000000000000000000000000000000000000007fffffff")},
|
||||||
{reflect.ValueOf(int64(math.MaxInt64)), []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 255, 255, 255, 255, 255, 255, 255}},
|
{reflect.ValueOf(int64(math.MaxInt64)), common.Hex2Bytes("0000000000000000000000000000000000000000000000007fffffffffffffff")},
|
||||||
|
|
||||||
{reflect.ValueOf(int8(math.MinInt8)), []byte{255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 128}},
|
{reflect.ValueOf(int8(math.MinInt8)), common.Hex2Bytes("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80")},
|
||||||
{reflect.ValueOf(int16(math.MinInt16)), []byte{255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 128, 0}},
|
{reflect.ValueOf(int16(math.MinInt16)), common.Hex2Bytes("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8000")},
|
||||||
{reflect.ValueOf(int32(math.MinInt32)), []byte{255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 128, 0, 0, 0}},
|
{reflect.ValueOf(int32(math.MinInt32)), common.Hex2Bytes("ffffffffffffffffffffffffffffffffffffffffffffffffffffffff80000000")},
|
||||||
{reflect.ValueOf(int64(math.MinInt64)), []byte{255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 128, 0, 0, 0, 0, 0, 0, 0}},
|
{reflect.ValueOf(int64(math.MinInt64)), common.Hex2Bytes("ffffffffffffffffffffffffffffffffffffffffffffffff8000000000000000")},
|
||||||
}
|
}
|
||||||
for i, tt := range tests {
|
for i, tt := range tests {
|
||||||
packed := packNum(tt.value)
|
packed := packNum(tt.value)
|
||||||
|
|
|
||||||
|
|
@ -37,35 +37,35 @@ func TestSimpleMethodUnpack(t *testing.T) {
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
`[ { "type": "bool" } ]`,
|
`[ { "type": "bool" } ]`,
|
||||||
pad([]byte{1}, 32, true),
|
common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"),
|
||||||
bool(true),
|
bool(true),
|
||||||
"bool",
|
"bool",
|
||||||
"",
|
"",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "uint32" } ]`,
|
`[ { "type": "uint32" } ]`,
|
||||||
pad([]byte{1}, 32, true),
|
common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"),
|
||||||
uint32(1),
|
uint32(1),
|
||||||
"uint32",
|
"uint32",
|
||||||
"",
|
"",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "uint32" } ]`,
|
`[ { "type": "uint32" } ]`,
|
||||||
pad([]byte{1}, 32, true),
|
common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"),
|
||||||
nil,
|
nil,
|
||||||
"uint16",
|
"uint16",
|
||||||
"abi: cannot unmarshal uint32 in to uint16",
|
"abi: cannot unmarshal uint32 in to uint16",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "uint17" } ]`,
|
`[ { "type": "uint17" } ]`,
|
||||||
pad([]byte{1}, 32, true),
|
common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"),
|
||||||
nil,
|
nil,
|
||||||
"uint16",
|
"uint16",
|
||||||
"abi: cannot unmarshal *big.Int in to uint16",
|
"abi: cannot unmarshal *big.Int in to uint16",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "uint17" } ]`,
|
`[ { "type": "uint17" } ]`,
|
||||||
pad([]byte{1}, 32, true),
|
common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"),
|
||||||
big.NewInt(1),
|
big.NewInt(1),
|
||||||
"*big.Int",
|
"*big.Int",
|
||||||
"",
|
"",
|
||||||
|
|
@ -73,28 +73,28 @@ func TestSimpleMethodUnpack(t *testing.T) {
|
||||||
|
|
||||||
{
|
{
|
||||||
`[ { "type": "int32" } ]`,
|
`[ { "type": "int32" } ]`,
|
||||||
pad([]byte{1}, 32, true),
|
common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"),
|
||||||
int32(1),
|
int32(1),
|
||||||
"int32",
|
"int32",
|
||||||
"",
|
"",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "int32" } ]`,
|
`[ { "type": "int32" } ]`,
|
||||||
pad([]byte{1}, 32, true),
|
common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"),
|
||||||
nil,
|
nil,
|
||||||
"int16",
|
"int16",
|
||||||
"abi: cannot unmarshal int32 in to int16",
|
"abi: cannot unmarshal int32 in to int16",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "int17" } ]`,
|
`[ { "type": "int17" } ]`,
|
||||||
pad([]byte{1}, 32, true),
|
common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"),
|
||||||
nil,
|
nil,
|
||||||
"int16",
|
"int16",
|
||||||
"abi: cannot unmarshal *big.Int in to int16",
|
"abi: cannot unmarshal *big.Int in to int16",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "int17" } ]`,
|
`[ { "type": "int17" } ]`,
|
||||||
pad([]byte{1}, 32, true),
|
common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"),
|
||||||
big.NewInt(1),
|
big.NewInt(1),
|
||||||
"*big.Int",
|
"*big.Int",
|
||||||
"",
|
"",
|
||||||
|
|
@ -102,35 +102,35 @@ func TestSimpleMethodUnpack(t *testing.T) {
|
||||||
|
|
||||||
{
|
{
|
||||||
`[ { "type": "address" } ]`,
|
`[ { "type": "address" } ]`,
|
||||||
pad(pad([]byte{1}, 20, false), 32, true),
|
common.Hex2Bytes("0000000000000000000000000100000000000000000000000000000000000000"),
|
||||||
common.Address{1},
|
common.Address{1},
|
||||||
"address",
|
"address",
|
||||||
"",
|
"",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "bytes32" } ]`,
|
`[ { "type": "bytes32" } ]`,
|
||||||
pad([]byte{1}, 32, false),
|
common.Hex2Bytes("0100000000000000000000000000000000000000000000000000000000000000"),
|
||||||
pad([]byte{1}, 32, false),
|
common.Hex2Bytes("0100000000000000000000000000000000000000000000000000000000000000"),
|
||||||
"bytes",
|
"bytes",
|
||||||
"",
|
"",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "bytes32" } ]`,
|
`[ { "type": "bytes32" } ]`,
|
||||||
pad([]byte{1}, 32, false),
|
common.Hex2Bytes("0100000000000000000000000000000000000000000000000000000000000000"),
|
||||||
pad([]byte{1}, 32, false),
|
common.Hex2Bytes("0100000000000000000000000000000000000000000000000000000000000000"),
|
||||||
"hash",
|
"hash",
|
||||||
"",
|
"",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "bytes32" } ]`,
|
`[ { "type": "bytes32" } ]`,
|
||||||
pad([]byte{1}, 32, false),
|
common.Hex2Bytes("0100000000000000000000000000000000000000000000000000000000000000"),
|
||||||
pad([]byte{1}, 32, false),
|
common.Hex2Bytes("0100000000000000000000000000000000000000000000000000000000000000"),
|
||||||
"interface",
|
"interface",
|
||||||
"",
|
"",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
`[ { "type": "function" } ]`,
|
`[ { "type": "function" } ]`,
|
||||||
pad([]byte{1}, 32, false),
|
common.Hex2Bytes("0100000000000000000000000000000000000000000000000000000000000000"),
|
||||||
[24]byte{1},
|
[24]byte{1},
|
||||||
"function",
|
"function",
|
||||||
"",
|
"",
|
||||||
|
|
@ -245,7 +245,7 @@ func TestUnpackSetInterfaceSlice(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
marshalledReturn := append(pad([]byte{1}, 32, true), pad([]byte{2}, 32, true)...)
|
marshalledReturn := append(common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"), common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000002")...)
|
||||||
err = abi.Unpack(&out, "ints", marshalledReturn)
|
err = abi.Unpack(&out, "ints", marshalledReturn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|
@ -276,7 +276,7 @@ func TestUnpackSetInterfaceArrayOutput(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
marshalledReturn := append(pad([]byte{1}, 32, true), pad([]byte{2}, 32, true)...)
|
marshalledReturn := append(common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000001"), common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000002")...)
|
||||||
err = abi.Unpack(&out, "ints", marshalledReturn)
|
err = abi.Unpack(&out, "ints", marshalledReturn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue