瀏覽代碼

Remove redundant function

Taylor Gerring 10 年之前
父節點
當前提交
cd4cc309ae
共有 3 個文件被更改,包括 3 次插入18 次删除
  1. 0 15
      core/transaction_util.go
  2. 1 1
      rpc/api/parsing.go
  3. 2 2
      xeth/xeth.go

+ 0 - 15
core/transaction_util.go

@@ -54,21 +54,6 @@ func PutReceipts(db common.Database, receipts types.Receipts) error {
 	return nil
 }
 
-// GetReceipt returns a receipt by hash
-func GetFullReceipt(db common.Database, txHash common.Hash) *types.ReceiptForStorage {
-	data, _ := db.Get(append(receiptsPre, txHash[:]...))
-	if len(data) == 0 {
-		return nil
-	}
-
-	var receipt types.ReceiptForStorage
-	err := rlp.DecodeBytes(data, &receipt)
-	if err != nil {
-		glog.V(logger.Error).Infoln("GetReceipt err:", err)
-	}
-	return &receipt
-}
-
 // GetReceipt returns a receipt by hash
 func GetReceipt(db common.Database, txHash common.Hash) *types.Receipt {
 	data, _ := db.Get(append(receiptsPre, txHash[:]...))

+ 1 - 1
rpc/api/parsing.go

@@ -413,7 +413,7 @@ type ReceiptRes struct {
 	Logs              *[]interface{} `json:logs`
 }
 
-func NewReceiptRes(rec *types.ReceiptForStorage) *ReceiptRes {
+func NewReceiptRes(rec *types.Receipt) *ReceiptRes {
 	if rec == nil {
 		return nil
 	}

+ 2 - 2
xeth/xeth.go

@@ -368,8 +368,8 @@ func (self *XEth) GetBlockReceipts(bhash common.Hash) types.Receipts {
 	return self.backend.BlockProcessor().GetBlockReceipts(bhash)
 }
 
-func (self *XEth) GetTxReceipt(txhash common.Hash) *types.ReceiptForStorage {
-	return core.GetFullReceipt(self.backend.ExtraDb(), txhash)
+func (self *XEth) GetTxReceipt(txhash common.Hash) *types.Receipt {
+	return core.GetReceipt(self.backend.ExtraDb(), txhash)
 }
 
 func (self *XEth) GasLimit() *big.Int {