From 458aae1c1ecf38c615d43cb777ab418d73f014f4 Mon Sep 17 00:00:00 2001 From: Arijit Das Date: Fri, 3 Sep 2021 19:05:49 +0530 Subject: [PATCH] Address comments. --- pkg/eth/cid_retriever.go | 4 ++-- pkg/eth/types.go | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/eth/cid_retriever.go b/pkg/eth/cid_retriever.go index 4c491b44..dac04955 100644 --- a/pkg/eth/cid_retriever.go +++ b/pkg/eth/cid_retriever.go @@ -314,7 +314,7 @@ func (ecr *CIDRetriever) RetrieveFilteredGQLLogs(tx *sqlx.Tx, rctFilter ReceiptF log.Debug("retrieving log cids for receipt ids") args := make([]interface{}, 0, 4) id := 1 - pgStr := `SELECT eth.log_cids.index, eth.log_cids.receipt_id, + pgStr := `SELECT eth.log_cids.leaf_cid, eth.log_cids.index, eth.log_cids.receipt_id, eth.log_cids.address, eth.log_cids.topic0, eth.log_cids.topic1, eth.log_cids.topic2, eth.log_cids.topic3, eth.log_cids.log_data, eth.transaction_cids.tx_hash, data, eth.receipt_cids.cid, eth.receipt_cids.post_status FROM eth.log_cids, eth.receipt_cids, eth.transaction_cids, eth.header_cids, public.blocks @@ -343,7 +343,7 @@ func (ecr *CIDRetriever) RetrieveFilteredGQLLogs(tx *sqlx.Tx, rctFilter ReceiptF func (ecr *CIDRetriever) RetrieveFilteredLog(tx *sqlx.Tx, rctFilter ReceiptFilter, blockNumber int64, blockHash *common.Hash) ([]LogResult, error) { log.Debug("retrieving log cids for receipt ids") args := make([]interface{}, 0, 4) - pgStr := `SELECT eth.log_cids.id,eth.log_cids.leaf_cid, eth.log_cids.index, eth.log_cids.receipt_id, + pgStr := `SELECT eth.log_cids.leaf_cid, eth.log_cids.index, eth.log_cids.receipt_id, eth.log_cids.address, eth.log_cids.topic0, eth.log_cids.topic1, eth.log_cids.topic2, eth.log_cids.topic3, eth.log_cids.log_data, eth.transaction_cids.tx_hash, eth.transaction_cids.index as txn_index, header_cids.block_hash, header_cids.block_number diff --git a/pkg/eth/types.go b/pkg/eth/types.go index 2522bc83..291f0da6 100644 --- a/pkg/eth/types.go +++ b/pkg/eth/types.go @@ -169,9 +169,7 @@ type ConvertedPayload struct { // LogResult represent a log. type LogResult struct { - ID int64 `db:"id"` LeafCID string `db:"leaf_cid"` - LeafMhKey string `db:"leaf_mh_key"` ReceiptID int64 `db:"receipt_id"` Address string `db:"address"` Index int64 `db:"index"`