From 25d16ae719a7c321299e4830ff7938548e380e83 Mon Sep 17 00:00:00 2001 From: xizho10 Date: Mon, 16 Jul 2018 15:18:34 +0800 Subject: [PATCH] change error to warn (#546) --- http/base/rest/interfaces.go | 9 ++++++--- http/base/rpc/interfaces.go | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/http/base/rest/interfaces.go b/http/base/rest/interfaces.go index 986fd908df..b61c6b9b99 100644 --- a/http/base/rest/interfaces.go +++ b/http/base/rest/interfaces.go @@ -275,6 +275,9 @@ func SendRawTransaction(cmd map[string]interface{}) map[string]interface{} { if err := txn.Deserialize(bytes.NewReader(bys)); err != nil { return ResponsePack(berr.INVALID_TRANSACTION) } + var hash common.Uint256 + hash = txn.Hash() + log.Debugf("SendRawTransaction recv %s", hash.ToHexString()) if txn.TxType == types.Invoke || txn.TxType == types.Deploy { if preExec, ok := cmd["PreExec"].(string); ok && preExec == "1" { resp["Result"], err = bactor.PreExecuteContract(&txn) @@ -285,15 +288,15 @@ func SendRawTransaction(cmd map[string]interface{}) map[string]interface{} { return resp } } - var hash common.Uint256 - hash = txn.Hash() + log.Debugf("SendRawTransaction send to txpool %s", hash.ToHexString()) if errCode, desc := bcomn.SendTxToPool(&txn); errCode != ontErrors.ErrNoError { resp["Error"] = int64(errCode) resp["Result"] = desc + log.Warnf("SendRawTransaction verified %s error: %s", hash.ToHexString(), desc) return resp } + log.Debugf("SendRawTransaction verified %s", hash.ToHexString()) resp["Result"] = hash.ToHexString() - return resp } diff --git a/http/base/rpc/interfaces.go b/http/base/rpc/interfaces.go index 3304d8ada9..7339006751 100644 --- a/http/base/rpc/interfaces.go +++ b/http/base/rpc/interfaces.go @@ -294,6 +294,8 @@ func SendRawTransaction(params []interface{}) map[string]interface{} { if err := txn.Deserialize(bytes.NewReader(hex)); err != nil { return responsePack(berr.INVALID_TRANSACTION, "") } + hash = txn.Hash() + log.Debugf("SendRawTransaction recv %s", hash.ToHexString()) if txn.TxType == types.Invoke || txn.TxType == types.Deploy { if len(params) > 1 { preExec, ok := params[1].(float64) @@ -308,10 +310,12 @@ func SendRawTransaction(params []interface{}) map[string]interface{} { } } - hash = txn.Hash() + log.Debugf("SendRawTransaction send to txpool %s", hash.ToHexString()) if errCode, desc := bcomn.SendTxToPool(&txn); errCode != ontErrors.ErrNoError { + log.Warnf("SendRawTransaction verified %s error: %s", hash.ToHexString(), desc) return responsePack(berr.INVALID_TRANSACTION, desc) } + log.Debugf("SendRawTransaction verified %s", hash.ToHexString()) default: return responsePack(berr.INVALID_PARAMS, "") }