diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go index 88589c5704..c7bc2b4541 100644 --- a/accounts/abi/abi.go +++ b/accounts/abi/abi.go @@ -309,13 +309,3 @@ func UnpackRevert(data []byte) (string, error) { return "", errors.New("invalid data for unpacking") } } - -func PackRevert(revertMessage string) []byte { - stringType, _ := NewType("string", "", nil) - args := Arguments{ - {Type: stringType}, - } - encodedMessage, _ := args.Pack(revertMessage) - - return append(revertSelector, encodedMessage...) -} diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index 6b35a2cb10..c008096be5 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -643,6 +643,16 @@ func TestEstimateGas(t *testing.T) { signer = types.HomesteadSigner{} randomAccounts = newAccounts(2) ) + packRevert := func(revertMessage string) []byte { + var revertSelector = crypto.Keccak256([]byte("Error(string)"))[:4] + stringType, _ := abi.NewType("string", "", nil) + args := abi.Arguments{ + {Type: stringType}, + } + encodedMessage, _ := args.Pack(revertMessage) + + return append(revertSelector, encodedMessage...) + } api := NewBlockChainAPI(newTestBackend(t, genBlocks, genesis, beacon.New(ethash.NewFaker()), func(i int, b *core.BlockGen) { // Transfer from account[0] to account[1] @@ -809,7 +819,7 @@ func TestEstimateGas(t *testing.T) { }, }, blockOverrides: BlockOverrides{Number: (*hexutil.Big)(big.NewInt(11))}, - expectErr: newRevertError(abi.PackRevert("block 11")), + expectErr: newRevertError(packRevert("block 11")), }, } for i, tc := range testSuite {