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

eth/tracer: rename to revertReason (#26574)

Browse Source
pull/26581/head
rjl493456442 2 years ago committed by GitHub
parent 78d089b5b7
commit efbd508d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 51 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 22
      eth/tracers/internal/tracetest/calltrace_test.go
  2. 24
      eth/tracers/native/call.go
  3. 56
      eth/tracers/native/gen_callframe_json.go

22
eth/tracers/internal/tracetest/calltrace_test.go
Unescape View File

@ -55,17 +55,17 @@ type callLog struct {
// callTrace is the result of a callTracer run. // callTrace is the result of a callTracer run.
type callTrace struct { type callTrace struct {
From common.Address `json:"from"` From common.Address `json:"from"`
Gas *hexutil.Uint64 `json:"gas"` Gas *hexutil.Uint64 `json:"gas"`
GasUsed *hexutil.Uint64 `json:"gasUsed"` GasUsed *hexutil.Uint64 `json:"gasUsed"`
To common.Address `json:"to,omitempty"` To common.Address `json:"to,omitempty"`
Input hexutil.Bytes `json:"input"` Input hexutil.Bytes `json:"input"`
Output hexutil.Bytes `json:"output,omitempty"` Output hexutil.Bytes `json:"output,omitempty"`
Error string `json:"error,omitempty"` Error string `json:"error,omitempty"`
Revertal string `json:"revertReason,omitempty"` RevertReason string `json:"revertReason,omitempty"`
Calls []callTrace `json:"calls,omitempty"` Calls []callTrace `json:"calls,omitempty"`
Logs []callLog `json:"logs,omitempty"` Logs []callLog `json:"logs,omitempty"`
Value *hexutil.Big `json:"value,omitempty"` Value *hexutil.Big `json:"value,omitempty"`
// Gencodec adds overridden fields at the end // Gencodec adds overridden fields at the end
Type string `json:"type"` Type string `json:"type"`
} }

24
eth/tracers/native/call.go
Unescape View File

@ -42,17 +42,17 @@ type callLog struct {
} }
type callFrame struct { type callFrame struct {
Type vm.OpCode `json:"-"` Type vm.OpCode `json:"-"`
From common.Address `json:"from"` From common.Address `json:"from"`
Gas uint64 `json:"gas"` Gas uint64 `json:"gas"`
GasUsed uint64 `json:"gasUsed"` GasUsed uint64 `json:"gasUsed"`
To common.Address `json:"to,omitempty" rlp:"optional"` To common.Address `json:"to,omitempty" rlp:"optional"`
Input []byte `json:"input" rlp:"optional"` Input []byte `json:"input" rlp:"optional"`
Output []byte `json:"output,omitempty" rlp:"optional"` Output []byte `json:"output,omitempty" rlp:"optional"`
Error string `json:"error,omitempty" rlp:"optional"` Error string `json:"error,omitempty" rlp:"optional"`
Revertal string `json:"revertReason,omitempty"` RevertReason string `json:"revertReason,omitempty"`
Calls []callFrame `json:"calls,omitempty" rlp:"optional"` Calls []callFrame `json:"calls,omitempty" rlp:"optional"`
Logs []callLog `json:"logs,omitempty" rlp:"optional"` Logs []callLog `json:"logs,omitempty" rlp:"optional"`
// Placed at end on purpose. The RLP will be decoded to 0 instead of // Placed at end on purpose. The RLP will be decoded to 0 instead of
// nil if there are non-empty elements after in the struct. // nil if there are non-empty elements after in the struct.
Value *big.Int `json:"value,omitempty" rlp:"optional"` Value *big.Int `json:"value,omitempty" rlp:"optional"`
@ -84,7 +84,7 @@ func (f *callFrame) processOutput(output []byte, err error) {
return return
} }
if unpacked, err := abi.UnpackRevert(output); err == nil { if unpacked, err := abi.UnpackRevert(output); err == nil {
f.Revertal = unpacked f.RevertReason = unpacked
} }
} }

56
eth/tracers/native/gen_callframe_json.go
Unescape View File

@ -16,19 +16,19 @@ var _ = (*callFrameMarshaling)(nil)
// MarshalJSON marshals as JSON. // MarshalJSON marshals as JSON.
func (c callFrame) MarshalJSON() ([]byte, error) { func (c callFrame) MarshalJSON() ([]byte, error) {
type callFrame0 struct { type callFrame0 struct {
Type vm.OpCode `json:"-"` Type vm.OpCode `json:"-"`
From common.Address `json:"from"` From common.Address `json:"from"`
Gas hexutil.Uint64 `json:"gas"` Gas hexutil.Uint64 `json:"gas"`
GasUsed hexutil.Uint64 `json:"gasUsed"` GasUsed hexutil.Uint64 `json:"gasUsed"`
To common.Address `json:"to,omitempty" rlp:"optional"` To common.Address `json:"to,omitempty" rlp:"optional"`
Input hexutil.Bytes `json:"input" rlp:"optional"` Input hexutil.Bytes `json:"input" rlp:"optional"`
Output hexutil.Bytes `json:"output,omitempty" rlp:"optional"` Output hexutil.Bytes `json:"output,omitempty" rlp:"optional"`
Error string `json:"error,omitempty" rlp:"optional"` Error string `json:"error,omitempty" rlp:"optional"`
Revertal string `json:"revertReason,omitempty"` RevertReason string `json:"revertReason,omitempty"`
Calls []callFrame `json:"calls,omitempty" rlp:"optional"` Calls []callFrame `json:"calls,omitempty" rlp:"optional"`
Logs []callLog `json:"logs,omitempty" rlp:"optional"` Logs []callLog `json:"logs,omitempty" rlp:"optional"`
Value *hexutil.Big `json:"value,omitempty" rlp:"optional"` Value *hexutil.Big `json:"value,omitempty" rlp:"optional"`
TypeString string `json:"type"` TypeString string `json:"type"`
} }
var enc callFrame0 var enc callFrame0
enc.Type = c.Type enc.Type = c.Type
@ -39,7 +39,7 @@ func (c callFrame) MarshalJSON() ([]byte, error) {
enc.Input = c.Input enc.Input = c.Input
enc.Output = c.Output enc.Output = c.Output
enc.Error = c.Error enc.Error = c.Error
enc.Revertal = c.Revertal enc.RevertReason = c.RevertReason
enc.Calls = c.Calls enc.Calls = c.Calls
enc.Logs = c.Logs enc.Logs = c.Logs
enc.Value = (*hexutil.Big)(c.Value) enc.Value = (*hexutil.Big)(c.Value)
@ -50,18 +50,18 @@ func (c callFrame) MarshalJSON() ([]byte, error) {
// UnmarshalJSON unmarshals from JSON. // UnmarshalJSON unmarshals from JSON.
func (c *callFrame) UnmarshalJSON(input []byte) error { func (c *callFrame) UnmarshalJSON(input []byte) error {
type callFrame0 struct { type callFrame0 struct {
Type *vm.OpCode `json:"-"` Type *vm.OpCode `json:"-"`
From *common.Address `json:"from"` From *common.Address `json:"from"`
Gas *hexutil.Uint64 `json:"gas"` Gas *hexutil.Uint64 `json:"gas"`
GasUsed *hexutil.Uint64 `json:"gasUsed"` GasUsed *hexutil.Uint64 `json:"gasUsed"`
To *common.Address `json:"to,omitempty" rlp:"optional"` To *common.Address `json:"to,omitempty" rlp:"optional"`
Input *hexutil.Bytes `json:"input" rlp:"optional"` Input *hexutil.Bytes `json:"input" rlp:"optional"`
Output *hexutil.Bytes `json:"output,omitempty" rlp:"optional"` Output *hexutil.Bytes `json:"output,omitempty" rlp:"optional"`
Error *string `json:"error,omitempty" rlp:"optional"` Error *string `json:"error,omitempty" rlp:"optional"`
Revertal *string `json:"revertReason,omitempty"` RevertReason *string `json:"revertReason,omitempty"`
Calls []callFrame `json:"calls,omitempty" rlp:"optional"` Calls []callFrame `json:"calls,omitempty" rlp:"optional"`
Logs []callLog `json:"logs,omitempty" rlp:"optional"` Logs []callLog `json:"logs,omitempty" rlp:"optional"`
Value *hexutil.Big `json:"value,omitempty" rlp:"optional"` Value *hexutil.Big `json:"value,omitempty" rlp:"optional"`
} }
var dec callFrame0 var dec callFrame0
if err := json.Unmarshal(input, &dec); err != nil { if err := json.Unmarshal(input, &dec); err != nil {
@ -91,8 +91,8 @@ func (c *callFrame) UnmarshalJSON(input []byte) error {
if dec.Error != nil { if dec.Error != nil {
c.Error = *dec.Error c.Error = *dec.Error
} }
if dec.Revertal != nil { if dec.RevertReason != nil {
c.Revertal = *dec.Revertal c.RevertReason = *dec.RevertReason
} }
if dec.Calls != nil { if dec.Calls != nil {
c.Calls = dec.Calls c.Calls = dec.Calls

Write Preview
Loading…
Cancel
Save