format

optimism-java · Jun 20, 2024 · d046991 · d046991
1 parent b3128a3
commit d046991
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/internal/handler/disputeGame.go b/internal/handler/disputeGame.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
+	"math/big"
+	"strings"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/optimism-java/dispute-explorer/pkg/log"
 	"golang.org/x/time/rate"
-	"math/big"
-	"strings"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/optimism-java/dispute-explorer/internal/blockchain"
@@ -25,7 +26,8 @@ type RetryDisputeGameClient struct {
 }
 
 func NewRetryDisputeGameClient(db *gorm.DB, address common.Address, rpc *ethclient.Client, limit rate.Limit,
-	burst int) (*RetryDisputeGameClient, error) {
+	burst int,
+) (*RetryDisputeGameClient, error) {
 	newDisputeGame, err := contract.NewDisputeGame(address, rpc)
 	if err != nil {
 		return nil, err
@@ -34,21 +36,21 @@ func NewRetryDisputeGameClient(db *gorm.DB, address common.Address, rpc *ethclie
 	return &RetryDisputeGameClient{Client: retryLimitGame, DB: db}, nil
 }
 
-func (r *RetryDisputeGameClient) ProcessDisputeGameCreated(ctx context.Context, evt *schema.SyncEvent) error {
+func (r *RetryDisputeGameClient) ProcessDisputeGameCreated(ctx context.Context, evt schema.SyncEvent) error {
 	dispute := event.DisputeGameCreated{}
 	err := dispute.ToObj(evt.Data)
 	if err != nil {
 		return fmt.Errorf("[processDisputeGameCreated] event data to DisputeGameCreated err: %s", err)
 	}
-	err = r.addDisputeGame(ctx, evt)
+	err = r.addDisputeGame(ctx, &evt)
 	if err != nil {
 		return fmt.Errorf("[processDisputeGameCreated] addDisputeGame err: %s", err)
 	}
 	blockchain.AddContract(dispute.DisputeProxy)
 	return nil
 }
 
-func (r *RetryDisputeGameClient) ProcessDisputeGameMove(ctx context.Context, evt *schema.SyncEvent) error {
+func (r *RetryDisputeGameClient) ProcessDisputeGameMove(ctx context.Context, evt schema.SyncEvent) error {
 	disputeGameMove := event.DisputeGameMove{}
 	err := disputeGameMove.ToObj(evt.Data)
 	if err != nil {
@@ -89,7 +91,7 @@ func (r *RetryDisputeGameClient) ProcessDisputeGameMove(ctx context.Context, evt
 	return nil
 }
 
-func (r *RetryDisputeGameClient) ProcessDisputeGameResolve(ctx context.Context, evt *schema.SyncEvent) error {
+func (r *RetryDisputeGameClient) ProcessDisputeGameResolve(evt schema.SyncEvent) error {
 	disputeResolved := event.DisputeGameResolved{}
 	err := disputeResolved.ToObj(evt.Data)
 	if err != nil {

diff --git a/internal/handler/syncDispute.go b/internal/handler/syncDispute.go
@@ -1,13 +1,14 @@
 package handler
 
 import (
+	"time"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/optimism-java/dispute-explorer/internal/schema"
 	"github.com/optimism-java/dispute-explorer/internal/svc"
 	"github.com/optimism-java/dispute-explorer/pkg/event"
 	"github.com/optimism-java/dispute-explorer/pkg/log"
 	"golang.org/x/time/rate"
-	"time"
 )
 
 func SyncDispute(ctx *svc.ServiceContext) {
@@ -22,42 +23,43 @@ func SyncDispute(ctx *svc.ServiceContext) {
 			disputeCreated := event.DisputeGameCreated{}
 			disputeMove := event.DisputeGameMove{}
 			disputeResolved := event.DisputeGameResolved{}
-			if evt.EventName == disputeCreated.Name() && evt.EventHash == disputeCreated.EventHash().String() {
+			switch {
+			case evt.EventName == disputeCreated.Name() && evt.EventHash == disputeCreated.EventHash().String():
 				err = disputeCreated.ToObj(evt.Data)
 				if err != nil {
 					log.Errorf("[handle.SyncDispute] event data to DisputeGameCreated err: %s", err)
 				}
 				disputeClient, err := NewRetryDisputeGameClient(ctx.DB, common.HexToAddress(disputeCreated.DisputeProxy),
 					ctx.L1RPC, rate.Limit(ctx.Config.RPCRateLimit), ctx.Config.RPCRateBurst)
 				if err != nil {
-					log.Errorf("[handle.SyncDispute] init client err: %s", err)
+					log.Errorf("[handle.SyncDispute] init client for created err: %s", err)
 				}
-				err = disputeClient.ProcessDisputeGameCreated(ctx.Context, &evt)
+				err = disputeClient.ProcessDisputeGameCreated(ctx.Context, evt)
 				if err != nil {
 					log.Errorf("[handle.SyncDispute] ProcessDisputeGameCreated err: %s", err)
 				}
-			}
-			if evt.EventName == disputeMove.Name() && evt.EventHash == disputeMove.EventHash().String() {
+			case evt.EventName == disputeMove.Name() && evt.EventHash == disputeMove.EventHash().String():
 				disputeClient, err := NewRetryDisputeGameClient(ctx.DB, common.HexToAddress(evt.ContractAddress),
 					ctx.L1RPC, rate.Limit(ctx.Config.RPCRateLimit), ctx.Config.RPCRateBurst)
 				if err != nil {
-					log.Errorf("[handle.SyncDispute] init client err: %s", err)
+					log.Errorf("[handle.SyncDispute] init client for move err: %s", err)
 				}
-				err = disputeClient.ProcessDisputeGameMove(ctx.Context, &evt)
+				err = disputeClient.ProcessDisputeGameMove(ctx.Context, evt)
 				if err != nil {
 					log.Errorf("[handle.SyncDispute] ProcessDisputeGameCreated err: %s", err)
 				}
-			}
-			if evt.EventName == disputeResolved.Name() && evt.EventHash == disputeResolved.EventHash().String() {
+			case evt.EventName == disputeResolved.Name() && evt.EventHash == disputeResolved.EventHash().String():
 				disputeClient, err := NewRetryDisputeGameClient(ctx.DB, common.HexToAddress(evt.ContractAddress),
 					ctx.L1RPC, rate.Limit(ctx.Config.RPCRateLimit), ctx.Config.RPCRateBurst)
 				if err != nil {
-					log.Errorf("[handle.SyncDispute] init client err: %s", err)
+					log.Errorf("[handle.SyncDispute] init client for resolved err: %s", err)
 				}
-				err = disputeClient.ProcessDisputeGameResolve(ctx.Context, &evt)
+				err = disputeClient.ProcessDisputeGameResolve(evt)
 				if err != nil {
 					log.Errorf("[handle.SyncDispute] ProcessDisputeGameCreated err: %s", err)
 				}
+			default:
+				log.Infof("this event does not be monitored %s, hash %s", evt.EventName, evt.EventHash)
 			}
 		}
 	}