Apply suggestions from code review

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

op-monitorism/faultproof_withdrawals/monitor_live_mainnet_test.go

@@ -55,9 +55,9 @@ func NewTestMonitorMainnet() *Monitor {
  return monitor
 }
 
-// TestSingleRuMainnet tests a single execution of the monitor's Run method.
+// TestSingleRunMainnet tests a single execution of the monitor's Run method.
 // It verifies that the state updates correctly after running.
-func TestSingleRuMainnet(t *testing.T) {
+func TestSingleRunMainnet(t *testing.T) {
  test_monitor := NewTestMonitorMainnet()
 
  initialBlock := uint64(20872390) // this block is known to have events with errors
@@ -163,7 +163,7 @@ func TestInvalidWithdrawalsOnMainnet(t *testing.T) {
  require.Equal(t, event.DisputeGame.DisputeGameData.L2blockNumber, big.NewInt(1276288764))
 
  isValid, err := test_monitor.withdrawalValidator.IsWithdrawalEventValid(&event)
- require.Error(t, err, "trustedRootClaim is nil, game not enriched")
+ require.EqualError(t, err, "trustedRootClaim is nil, game not enriched")
  fmt.Printf("isValid: %+v\n", isValid)
  fmt.Printf("event: %+v\n", event)
  err = test_monitor.withdrawalValidator.UpdateEnrichedWithdrawalEvent(&event)

op-monitorism/faultproof_withdrawals/monitor_live_sepolia_test.go

@@ -69,7 +69,7 @@ func TestSingleRunSepolia(t *testing.T) {
 
  test_monitor.state.nextL1Height = initialBlock
  test_monitor.maxBlockRange = blockIncrement
- test_monitor.Run(test_monitor.ctx)
+ test_monitor.Run(context.Background())
 
  require.Equal(t, finalBlock, test_monitor.state.nextL1Height)
  require.Equal(t, uint64(1), test_monitor.state.withdrawalsValidated)
@@ -137,11 +137,11 @@ func TestConsumeEventValid_DEFENDER_WINS_Sepolia(t *testing.T) {
  consumedEvent, err := test_monitor.ConsumeEvent(validEvent)
  require.NoError(t, err)
  require.True(t, consumedEvent)
- require.Equal(t, test_monitor.state.withdrawalsValidated, uint64(1))
- require.Equal(t, test_monitor.state.processedProvenWithdrawalsExtension1Events, uint64(1))
- require.Equal(t, test_monitor.state.numberOfDetectedForgery, uint64(0))
- require.Equal(t, len(test_monitor.state.forgeriesWithdrawalsEvents), 0)
- require.Equal(t, len(test_monitor.state.invalidProposalWithdrawalsEvents), 0)
+ require.Equal(t, uint64(1), test_monitor.state.withdrawalsValidated)
+ require.Equal(t, uint64(1), test_monitor.state.processedProvenWithdrawalsExtension1Events)
+ require.Equal(t, uint64(0), test_monitor.state.numberOfDetectedForgery)
+ require.Equal(t, 0, len(test_monitor.state.forgeriesWithdrawalsEvents))
+ require.Equal(t, 0, len(test_monitor.state.invalidProposalWithdrawalsEvents))
 }
 
 // TestConsumeEventValid_CHALLENGER_WINS_Sepolia tests the consumption of a valid event where the challenger wins.
@@ -185,11 +185,11 @@ func TestConsumeEventValid_CHALLENGER_WINS_Sepolia(t *testing.T) {
  consumedEvent, err := test_monitor.ConsumeEvent(event)
  require.NoError(t, err)
  require.True(t, consumedEvent)
- require.Equal(t, test_monitor.state.withdrawalsValidated, uint64(1))
- require.Equal(t, test_monitor.state.processedProvenWithdrawalsExtension1Events, uint64(1))
- require.Equal(t, test_monitor.state.numberOfDetectedForgery, uint64(0))
- require.Equal(t, len(test_monitor.state.forgeriesWithdrawalsEvents), 0)
- require.Equal(t, len(test_monitor.state.invalidProposalWithdrawalsEvents), 0)
+ require.Equal(t, uint64(1), test_monitor.state.withdrawalsValidated)
+ require.Equal(t, uint64(1), test_monitor.state.processedProvenWithdrawalsExtension1Events)
+ require.Equal(t, uint64(0), test_monitor.state.numberOfDetectedForgery)
+ require.Equal(t, 0, len(test_monitor.state.forgeriesWithdrawalsEvents))
+ require.Equal(t, 0, len(test_monitor.state.invalidProposalWithdrawalsEvents))
 }
 
 // TestConsumeEventValid_BlacklistedSepolia tests the consumption of a valid event that is blacklisted.
@@ -233,11 +233,11 @@ func TestConsumeEventValid_BlacklistedSepolia(t *testing.T) {
  consumedEvent, err := test_monitor.ConsumeEvent(event)
  require.NoError(t, err)
  require.True(t, consumedEvent)
- require.Equal(t, test_monitor.state.withdrawalsValidated, uint64(1))
- require.Equal(t, test_monitor.state.processedProvenWithdrawalsExtension1Events, uint64(1))
- require.Equal(t, test_monitor.state.numberOfDetectedForgery, uint64(0))
- require.Equal(t, len(test_monitor.state.forgeriesWithdrawalsEvents), 0)
- require.Equal(t, len(test_monitor.state.invalidProposalWithdrawalsEvents), 0)
+ require.Equal(t, uint64(1), test_monitor.state.withdrawalsValidated)
+ require.Equal(t, uint64(1), test_monitor.state.processedProvenWithdrawalsExtension1Events)
+ require.Equal(t, uint64(0), test_monitor.state.numberOfDetectedForgery)
+ require.Equal(t, 0, len(test_monitor.state.forgeriesWithdrawalsEvents))
+ require.Equal(t, 0, len(test_monitor.state.invalidProposalWithdrawalsEvents))
 }
 
 // TestConsumeEventForgery1Sepolia tests the consumption of an event that indicates a forgery.
@@ -280,11 +280,11 @@ func TestConsumeEventForgery1Sepolia(t *testing.T) {
  consumedEvent, err := test_monitor.ConsumeEvent(validEvent)
  require.NoError(t, err)
  require.True(t, consumedEvent)
- require.Equal(t, test_monitor.state.withdrawalsValidated, uint64(0))
- require.Equal(t, test_monitor.state.processedProvenWithdrawalsExtension1Events, uint64(1))
- require.Equal(t, test_monitor.state.numberOfDetectedForgery, uint64(1))
- require.Equal(t, len(test_monitor.state.forgeriesWithdrawalsEvents), 1)
- require.Equal(t, len(test_monitor.state.invalidProposalWithdrawalsEvents), 0)
+ require.Equal(t, uint64(0), test_monitor.state.withdrawalsValidated)
+ require.Equal(t, uint64(1), test_monitor.state.processedProvenWithdrawalsExtension1Events)
+ require.Equal(t, uint64(1), test_monitor.state.numberOfDetectedForgery)
+ require.Equal(t, 1, len(test_monitor.state.forgeriesWithdrawalsEvents))
+ require.Equal(t, 0, len(test_monitor.state.invalidProposalWithdrawalsEvents))
 }
 
 // TestConsumeEventForgery2Sepolia tests the consumption of another event that indicates a forgery.

op-monitorism/faultproof_withdrawals/validator/proven_withdrawal_validator.go

@@ -41,7 +41,7 @@ type ProvenWithdrawalValidator struct {
 }
 
 // String provides a string representation of EnrichedProvenWithdrawalEvent.
-func (e EnrichedProvenWithdrawalEvent) String() string {
+func (e *EnrichedProvenWithdrawalEvent) String() string {
  return fmt.Sprintf("Event: %v, DisputeGame: %v, ExpectedRootClaim: %s, Blacklisted: %v, withdrawalHashPresentOnL2: %v, Enriched: %v",
  e.Event,
  e.DisputeGame,
@@ -206,7 +206,7 @@ func (wv *ProvenWithdrawalValidator) GetEnrichedWithdrawalsEvents(start uint64,
 // GetEnrichedWithdrawalsEvents retrieves enriched withdrawal events within the specified block range.
 // It returns a slice of EnrichedProvenWithdrawalEvent along with any error encountered.
 func (wv *ProvenWithdrawalValidator) GetEnrichedWithdrawalsEventsMap(start uint64, end *uint64) (map[common.Hash]EnrichedProvenWithdrawalEvent, error) {
- iterator, err := wv.optimismPortal2Helper.GetProvenWithdrawalsExtension1EventsIterartor(start, end)
+ iterator, err := wv.optimismPortal2Helper.GetProvenWithdrawalsExtension1EventsIterator(start, end)
  if err != nil {
  return nil, fmt.Errorf("failed to get proven withdrawals extension1 iterator error:%w", err)
  }
@@ -228,8 +228,8 @@ func (wv *ProvenWithdrawalValidator) GetEnrichedWithdrawalsEventsMap(start uint6
  return nil, fmt.Errorf("failed to get enriched withdrawal event: %w", err)
  }
 
- key := &enrichedWithdrawalEvent.Event.Raw.TxHash
- enrichedProvenWithdrawalEvents[*key] = *enrichedWithdrawalEvent
+ key := enrichedWithdrawalEvent.Event.Raw.TxHash
+ enrichedProvenWithdrawalEvents[key] = *enrichedWithdrawalEvent
  }
 
  return enrichedProvenWithdrawalEvents, nil