chore(op-challenger): address comment & cosmetic

ethstorage · Oct 27, 2024 · 425ac92 · 425ac92
1 parent 94a6133
commit 425ac92
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/op-challenger/game/fault/contracts/faultdisputegame_test.go b/op-challenger/game/fault/contracts/faultdisputegame_test.go
@@ -388,7 +388,7 @@ func TestGetSubClaims(t *testing.T) {
 				require.NoError(t, err)
 				packed, err := tx.MarshalBinary()
 				require.NoError(t, err)
-				stubRpc.SetTxResponse(txHash, packed)
+				stubRpc.SetGetTxByHashResponse(txHash, packed)
 
 				claims, err := game.GetSubClaims(context.Background(), block, &claim0)
 				require.NoError(t, err)

diff --git a/op-service/sources/batching/test/abi_stub.go b/op-service/sources/batching/test/abi_stub.go
@@ -163,11 +163,11 @@ func (l *AbiBasedRpc) SetFilterLogResponse(topics [][]common.Hash, to common.Add
 	})
 }
 
-func (l *AbiBasedRpc) SetTxResponse(txHash common.Hash, output []byte) {
+func (l *AbiBasedRpc) SetGetTxByHashResponse(txHash common.Hash, output []byte) {
 	if output == nil {
 		output = []byte{}
 	}
-	l.AddExpectedCall(&expectedTxCall{txHash: txHash, outputs: output})
+	l.AddExpectedCall(&expectedGetTxByHashCall{txHash: txHash, outputs: output})
 }
 
 func (l *AbiBasedRpc) VerifyTxCandidate(candidate txmgr.TxCandidate) {

diff --git a/op-service/sources/batching/test/event_stub.go b/op-service/sources/batching/test/event_stub.go
@@ -41,7 +41,7 @@ func (c *expectedFilterLogsCall) Matches(rpcMethod string, args ...interface{})
 func (c *expectedFilterLogsCall) Execute(t *testing.T, out interface{}) error {
 	j, err := json.Marshal(c.outputs)
 	require.NoError(t, err)
-	json.Unmarshal(j, out)
+	require.NoError(t, json.Unmarshal(j, out))
 	return c.err
 }
 

diff --git a/op-service/sources/batching/test/tx_stub.go b/op-service/sources/batching/test/tx_stub.go
@@ -10,13 +10,13 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-type expectedTxCall struct {
+type expectedGetTxByHashCall struct {
 	txHash  common.Hash
 	outputs []byte
 	err     error
 }
 
-func (c *expectedTxCall) Matches(rpcMethod string, args ...interface{}) error {
+func (c *expectedGetTxByHashCall) Matches(rpcMethod string, args ...interface{}) error {
 	if rpcMethod != "eth_getTransactionByHash" {
 		return fmt.Errorf("expected rpcMethod eth_getTransactionByHash but was %v", rpcMethod)
 	}
@@ -30,13 +30,13 @@ func (c *expectedTxCall) Matches(rpcMethod string, args ...interface{}) error {
 	return c.err
 }
 
-func (c *expectedTxCall) Execute(t *testing.T, out interface{}) error {
+func (c *expectedGetTxByHashCall) Execute(t *testing.T, out interface{}) error {
 	j, err := json.Marshal(hexutil.Bytes(c.outputs))
 	require.NoError(t, err)
-	json.Unmarshal(j, out)
+	require.NoError(t, json.Unmarshal(j, out))
 	return c.err
 }
 
-func (c *expectedTxCall) String() string {
+func (c *expectedGetTxByHashCall) String() string {
 	return fmt.Sprintf("{txHash: %v, outputs: %v}", c.txHash, c.outputs)
 }