mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-22 12:46:44 +00:00
fix: implement StructLog.WriteTo WriterTo signature .
This commit is contained in:
parent
e0d81d1e99
commit
2da0d290ae
1 changed files with 63 additions and 16 deletions
|
|
@ -95,34 +95,77 @@ func (s *StructLog) ErrorString() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
// WriteTo writes the human-readable log data into the supplied writer.
|
// WriteTo writes the human-readable log data into the supplied writer.
|
||||||
func (s *StructLog) WriteTo(writer io.Writer) {
|
func (s *StructLog) WriteTo(writer io.Writer) (int64, error) {
|
||||||
fmt.Fprintf(writer, "%-16spc=%08d gas=%v cost=%v", s.Op, s.Pc, s.Gas, s.GasCost)
|
var written int64
|
||||||
if s.Err != nil {
|
|
||||||
fmt.Fprintf(writer, " ERROR: %v", s.Err)
|
writef := func(format string, args ...interface{}) error {
|
||||||
|
n, err := fmt.Fprintf(writer, format, args...)
|
||||||
|
written += int64(n)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
write := func(text string) error {
|
||||||
|
n, err := io.WriteString(writer, text)
|
||||||
|
written += int64(n)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
writeln := func() error {
|
||||||
|
n, err := fmt.Fprintln(writer)
|
||||||
|
written += int64(n)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := writef("%-16spc=%08d gas=%v cost=%v", s.Op, s.Pc, s.Gas, s.GasCost); err != nil {
|
||||||
|
return written, err
|
||||||
|
}
|
||||||
|
if s.Err != nil {
|
||||||
|
if err := writef(" ERROR: %v", s.Err); err != nil {
|
||||||
|
return written, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := writeln(); err != nil {
|
||||||
|
return written, err
|
||||||
}
|
}
|
||||||
fmt.Fprintln(writer)
|
|
||||||
|
|
||||||
if len(s.Stack) > 0 {
|
if len(s.Stack) > 0 {
|
||||||
fmt.Fprintln(writer, "Stack:")
|
if err := write("Stack:\n"); err != nil {
|
||||||
|
return written, err
|
||||||
|
}
|
||||||
for i := len(s.Stack) - 1; i >= 0; i-- {
|
for i := len(s.Stack) - 1; i >= 0; i-- {
|
||||||
fmt.Fprintf(writer, "%08d %s\n", len(s.Stack)-i-1, s.Stack[i].Hex())
|
if err := writef("%08d %s\n", len(s.Stack)-i-1, s.Stack[i].Hex()); err != nil {
|
||||||
|
return written, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(s.Memory) > 0 {
|
if len(s.Memory) > 0 {
|
||||||
fmt.Fprintln(writer, "Memory:")
|
if err := write("Memory:\n"); err != nil {
|
||||||
fmt.Fprint(writer, hex.Dump(s.Memory))
|
return written, err
|
||||||
|
}
|
||||||
|
if err := write(hex.Dump(s.Memory)); err != nil {
|
||||||
|
return written, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if len(s.Storage) > 0 {
|
if len(s.Storage) > 0 {
|
||||||
fmt.Fprintln(writer, "Storage:")
|
if err := write("Storage:\n"); err != nil {
|
||||||
|
return written, err
|
||||||
|
}
|
||||||
for h, item := range s.Storage {
|
for h, item := range s.Storage {
|
||||||
fmt.Fprintf(writer, "%x: %x\n", h, item)
|
if err := writef("%x: %x\n", h, item); err != nil {
|
||||||
|
return written, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(s.ReturnData) > 0 {
|
if len(s.ReturnData) > 0 {
|
||||||
fmt.Fprintln(writer, "ReturnData:")
|
if err := write("ReturnData:\n"); err != nil {
|
||||||
fmt.Fprint(writer, hex.Dump(s.ReturnData))
|
return written, err
|
||||||
|
}
|
||||||
|
if err := write(hex.Dump(s.ReturnData)); err != nil {
|
||||||
|
return written, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
fmt.Fprintln(writer)
|
if err := writeln(); err != nil {
|
||||||
|
return written, err
|
||||||
|
}
|
||||||
|
return written, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// structLogLegacy stores a structured log emitted by the EVM while replaying a
|
// structLogLegacy stores a structured log emitted by the EVM while replaying a
|
||||||
|
|
@ -324,7 +367,9 @@ func (l *StructLogger) OnOpcode(pc uint64, opcode byte, gas, cost uint64, scope
|
||||||
l.logs = append(l.logs, entry)
|
l.logs = append(l.logs, entry)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
log.WriteTo(l.writer)
|
if _, err := log.WriteTo(l.writer); err != nil {
|
||||||
|
l.Stop(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// OnExit is called a call frame finishes processing.
|
// OnExit is called a call frame finishes processing.
|
||||||
|
|
@ -405,7 +450,9 @@ func (l *StructLogger) Output() []byte { return l.output }
|
||||||
// @deprecated
|
// @deprecated
|
||||||
func WriteTrace(writer io.Writer, logs []StructLog) {
|
func WriteTrace(writer io.Writer, logs []StructLog) {
|
||||||
for _, log := range logs {
|
for _, log := range logs {
|
||||||
log.WriteTo(writer)
|
if _, err := log.WriteTo(writer); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue