浏览代码

结果封装好了

skyfffire 2 年之前
父节点
当前提交
bc350711e4
共有 2 个文件被更改,包括 5 次插入6 次删除
  1. 1 2
      internal/ethapi/call_result.go
  2. 4 4
      internal/ethapi/public_eth2_api.go

+ 1 - 2
internal/ethapi/call_result.go

@@ -4,8 +4,7 @@ import "github.com/ethereum/go-ethereum/common/hexutil"
 
 // CallResult is the result of one call.
 type CallResult struct {
-	Return  hexutil.Bytes `json:"return,omitempty"`
+	Data    hexutil.Bytes `json:"data,omitempty"`
 	Msg     string        `json:"message"`
 	Success bool          `json:"state"`
-	Data    string        `json:"data,omitempty"`
 }

+ 4 - 4
internal/ethapi/public_eth2_api.go

@@ -23,10 +23,10 @@ func (s *PublicEthereum2API) Call(ctx context.Context, args CallArgs, blockNrOrH
 	} else {
 		if len(result.Revert()) > 0 {
 			revertErr := newRevertError(result)
-			return CallResult{Success: false, Data: revertErr.reason, Msg: revertErr.Error()}, nil
+			return CallResult{Success: false, Data: result.Revert(), Msg: revertErr.Error()}, nil
 		}
 
-		return CallResult{Success: true, Return: result.Return()}, nil
+		return CallResult{Success: true, Data: result.Return()}, nil
 	}
 }
 
@@ -79,9 +79,9 @@ func (s *PublicEthereum2API) BatchCall(ctx context.Context, config BatchCallConf
 		} else {
 			if len(result.Revert()) > 0 {
 				revertErr := newRevertError(result)
-				results = append(results, CallResult{Success: false, Return: result.Return(), Msg: revertErr.Error()})
+				results = append(results, CallResult{Success: false, Data: result.Revert(), Msg: revertErr.Error()})
 			} else {
-				results = append(results, CallResult{Success: true, Return: result.Return()})
+				results = append(results, CallResult{Success: true, Data: result.Return()})
 			}
 		}
 	}