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

internal/ethapi: simplify logic

This commit is contained in:
Marius van der Wijden 2020-05-21 15:33:27 +02:00 committed by Péter Szilágyi
parent 024e5a74f2
commit fbdc6bba66
No known key found for this signature in database
GPG Key ID: E9AE538CEDF8293D
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accounts/abi/bind/backends/simulated.go
View File

@ -361,7 +361,7 @@ func (b *SimulatedBackend) CallContract(ctx context.Context, call ethereum.CallM
return nil, err
}
// If the result contains a revert reason, try to unpack and return it.
if res.Err != nil && len(res.Revert()) > 0 {
if len(res.Revert()) > 0 {
reason, err := abi.UnpackRevert(res.Revert())
if err == nil {
return nil, fmt.Errorf("execution reverted: %v", reason)
@ -381,7 +381,7 @@ func (b *SimulatedBackend) PendingCallContract(ctx context.Context, call ethereu
return nil, err
}
// If the result contains a revert reason, try to unpack and return it.
if res.Err != nil && len(res.Revert()) > 0 {
if len(res.Revert()) > 0 {
reason, err := abi.UnpackRevert(res.Revert())
if err == nil {
return nil, fmt.Errorf("execution reverted: %v", reason)

6
internal/ethapi/api.go
View File

@ -862,13 +862,13 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNrOrHash rpc.Blo
return nil, fmt.Errorf("execution aborted (timeout = %v)", timeout)
}
// If the result contains a revert reason, try to unpack and return it.
if res.Err != nil && len(res.Revert()) > 0 {
reason, err := abi.UnpackRevert(res.Revert())
if len(result.Revert()) > 0 {
reason, err := abi.UnpackRevert(result.Revert())
if err == nil {
return nil, fmt.Errorf("execution reverted: %v", reason)
}
}
return result, res.Err
return result, result.Err
}
// Call executes the given transaction on the state for the given block number.