update rpc tests (cosmos#276)

* update rpc tests * cleanup * add log assertion to getTransacionReceipt * fix queurier_test * address comment
vulcanize · May 4, 2020 · ce0feb3 · ce0feb3
1 parent 26d4e96
commit ce0feb3
Show file tree

Hide file tree

Showing 10 changed files with 146 additions and 158 deletions.
diff --git a/rpc/backend.go b/rpc/backend.go
@@ -28,7 +28,7 @@ type Backend interface {
 	PendingTransactions() ([]*Transaction, error)
 
 	// Used by log filter
-	GetTxLogs(txHash common.Hash) ([]*ethtypes.Log, error)
+	GetTransactionLogs(txHash common.Hash) ([]*ethtypes.Log, error)
 	// TODO: Bloom methods
 }
 
@@ -154,12 +154,12 @@ func (e *EthermintBackend) getGasLimit() (int64, error) {
 	return gasLimit, nil
 }
 
-// GetTxLogs returns the logs given a transaction hash.
-func (e *EthermintBackend) GetTxLogs(txHash common.Hash) ([]*ethtypes.Log, error) {
+// GetTransactionLogs returns the logs given a transaction hash.
+func (e *EthermintBackend) GetTransactionLogs(txHash common.Hash) ([]*ethtypes.Log, error) {
 	// do we need to use the block height somewhere?
 	ctx := e.cliCtx
 
-	res, _, err := ctx.QueryWithData(fmt.Sprintf("custom/%s/%s/%s", types.ModuleName, evm.QueryTxLogs, txHash.Hex()), nil)
+	res, _, err := ctx.QueryWithData(fmt.Sprintf("custom/%s/%s/%s", types.ModuleName, evm.QueryTransactionLogs, txHash.Hex()), nil)
 	if err != nil {
 		return nil, err
 	}

diff --git a/rpc/eth_api.go b/rpc/eth_api.go
@@ -241,9 +241,9 @@ func (e *PublicEthAPI) GetCode(address common.Address, blockNumber BlockNumber)
 	return out.Code, nil
 }
 
-// GetTxLogs returns the logs given a transaction hash.
-func (e *PublicEthAPI) GetTxLogs(txHash common.Hash) ([]*ethtypes.Log, error) {
-	return e.backend.GetTxLogs(txHash)
+// GetTransactionLogs returns the logs given a transaction hash.
+func (e *PublicEthAPI) GetTransactionLogs(txHash common.Hash) ([]*ethtypes.Log, error) {
+	return e.backend.GetTransactionLogs(txHash)
 }
 
 // Sign signs the provided data using the private key of address via Geth's signature standard.

diff --git a/rpc/filters.go b/rpc/filters.go
@@ -273,7 +273,7 @@ func (f *Filter) checkMatches(block map[string]interface{}) ([]*ethtypes.Log, er
 	unfiltered := []*ethtypes.Log{}
 
 	for _, tx := range transactions {
-		logs, err := f.backend.GetTxLogs(common.BytesToHash(tx[:]))
+		logs, err := f.backend.GetTransactionLogs(common.BytesToHash(tx[:]))
 		if err != nil {
 			return nil, err
 		}