From 5a3e8eb26571c11abbfbc37b8541da43b53044bd Mon Sep 17 00:00:00 2001 From: Marcelo Politzer <251334+mpolitzer@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:35:32 -0300 Subject: [PATCH] refactor: code format --- cmd/cartesi-rollups-evm-reader/root/root.go | 10 +- internal/advancer/advancer.go | 3 +- internal/advancer/advancer_test.go | 2 +- internal/advancer/machines/machines_test.go | 1 - internal/claimer/claimer.go | 10 +- internal/claimer/claimer_test.go | 131 ++++++++++---------- internal/evmreader/evmreader.go | 4 +- internal/node/services.go | 2 +- internal/repository/claimer_test.go | 44 +++---- internal/repository/evmreader.go | 1 - pkg/service/log.go | 1 + 11 files changed, 103 insertions(+), 106 deletions(-) diff --git a/cmd/cartesi-rollups-evm-reader/root/root.go b/cmd/cartesi-rollups-evm-reader/root/root.go index c4b81edad..7d7f43e28 100644 --- a/cmd/cartesi-rollups-evm-reader/root/root.go +++ b/cmd/cartesi-rollups-evm-reader/root/root.go @@ -61,11 +61,11 @@ func init() { createInfo.BlockchainWsEndpoint.Value, "Blockchain WS Endpoint") -// Cmd.Flags().StringVarP(&inputBoxAddress, -// "inputbox-address", -// "i", -// "", -// "Input Box contract address") + // Cmd.Flags().StringVarP(&inputBoxAddress, + // "inputbox-address", + // "i", + // "", + // "Input Box contract address") Cmd.Flags().Uint64VarP(&createInfo.InputBoxDeploymentBlock, "inputbox-block-number", diff --git a/internal/advancer/advancer.go b/internal/advancer/advancer.go index 9e5dea38f..e205ba28a 100644 --- a/internal/advancer/advancer.go +++ b/internal/advancer/advancer.go @@ -51,7 +51,7 @@ type Advancer struct { type Service struct { service.Service Advancer - inspector *inspect.Inspector + inspector *inspect.Inspector } func New(machines IAdvancerMachines, repository IAdvancerRepository) (*Advancer, error) { @@ -212,4 +212,3 @@ func (advancer *Advancer) process(ctx context.Context, app Address, inputs []*In return nil } - diff --git a/internal/advancer/advancer_test.go b/internal/advancer/advancer_test.go index 5a863da84..acc27b539 100644 --- a/internal/advancer/advancer_test.go +++ b/internal/advancer/advancer_test.go @@ -111,7 +111,7 @@ func (s *AdvancerSuite) TestProcess() { machines.Map[app] = &MockMachine{} repository := &MockRepository{} advancer := &Advancer{ - machines: machines, + machines: machines, repository: repository, } return machines, repository, advancer, app diff --git a/internal/advancer/machines/machines_test.go b/internal/advancer/machines/machines_test.go index bb35c1c56..f44979fc3 100644 --- a/internal/advancer/machines/machines_test.go +++ b/internal/advancer/machines/machines_test.go @@ -8,4 +8,3 @@ type machinesMock struct { mock.Mock Machines } - diff --git a/internal/claimer/claimer.go b/internal/claimer/claimer.go index e1f785136..af5bf45a9 100644 --- a/internal/claimer/claimer.go +++ b/internal/claimer/claimer.go @@ -54,7 +54,7 @@ import ( var ( ErrClaimMismatch = fmt.Errorf("claim and antecessor mismatch") ErrEventMismatch = fmt.Errorf("Computed Claim mismatches ClaimSubmission event") - ErrMissingEvent = fmt.Errorf("accepted claim has no matching blockchain event") + ErrMissingEvent = fmt.Errorf("accepted claim has no matching blockchain event") ) type address = common.Address @@ -283,13 +283,13 @@ func (s *Service) submitClaimsAndUpdateDatabase(se sideEffects) []error { goto nextApp } s.Logger.Info("claimer: Submitting claim to blockchain", - "app", currClaimRow.AppContractAddress, - "claim", currClaimRow.EpochHash, + "app", currClaimRow.AppContractAddress, + "claim", currClaimRow.EpochHash, "last_block", currClaimRow.EpochLastBlock, ) s.claimsInFlight[currClaimRow.AppContractAddress] = txHash } - nextApp: + nextApp: } return errs } @@ -335,7 +335,7 @@ func checkClaimsConstraint(p *claimRow, c *claimRow) error { } func claimMatchesEvent(c *claimRow, e *claimSubmissionEvent) bool { - return c.AppContractAddress == e.AppContract && + return c.AppContractAddress == e.AppContract && c.EpochLastBlock == e.LastProcessedBlockNumber.Uint64() } diff --git a/internal/claimer/claimer_test.go b/internal/claimer/claimer_test.go index 0591b288f..f64d114af 100644 --- a/internal/claimer/claimer_test.go +++ b/internal/claimer/claimer_test.go @@ -112,11 +112,11 @@ func TestSubmitFirstClaim(t *testing.T) { appContractAddress := common.HexToAddress("0x01") claimTransactionHash := common.HexToHash("0x10") currClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 3, - EpochFirstBlock: 30, - EpochLastBlock: 39, + EpochIndex: 3, + EpochFirstBlock: 30, + EpochLastBlock: 39, } var prevEvent *claimSubmissionEvent = nil @@ -148,18 +148,18 @@ func TestSubmitClaimWithAntecessor(t *testing.T) { appContractAddress := common.HexToAddress("0x01") claimTransactionHash := common.HexToHash("0x10") prevClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 1, - EpochFirstBlock: 10, - EpochLastBlock: 19, + EpochIndex: 1, + EpochFirstBlock: 10, + EpochLastBlock: 19, } currClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 3, - EpochFirstBlock: 30, - EpochLastBlock: 39, + EpochIndex: 3, + EpochFirstBlock: 30, + EpochLastBlock: 39, } prevClaims := map[address]claimRow{ @@ -197,11 +197,11 @@ func TestSkipSubmitFirstClaim(t *testing.T) { appContractAddress := common.HexToAddress("0x01") claimTransactionHash := common.HexToHash("0x10") currClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 3, - EpochFirstBlock: 30, - EpochLastBlock: 39, + EpochIndex: 3, + EpochFirstBlock: 30, + EpochLastBlock: 39, } var prevEvent *claimSubmissionEvent = nil @@ -234,18 +234,18 @@ func TestSkipSubmitClaimWithAntecessor(t *testing.T) { appContractAddress := common.HexToAddress("0x01") claimTransactionHash := common.HexToHash("0x10") prevClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 1, - EpochFirstBlock: 10, - EpochLastBlock: 19, + EpochIndex: 1, + EpochFirstBlock: 10, + EpochLastBlock: 19, } currClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 3, - EpochFirstBlock: 30, - EpochLastBlock: 39, + EpochIndex: 3, + EpochFirstBlock: 30, + EpochLastBlock: 39, } prevClaims := map[address]claimRow{ @@ -283,11 +283,11 @@ func TestInFlightCompleted(t *testing.T) { reqHash := common.HexToHash("0x10") txHash := common.HexToHash("0x100") currClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 1, - EpochFirstBlock: 10, - EpochLastBlock: 19, + EpochIndex: 1, + EpochFirstBlock: 10, + EpochLastBlock: 19, } prevClaims := map[address]claimRow{} currClaims := map[address]claimRow{ @@ -300,7 +300,7 @@ func TestInFlightCompleted(t *testing.T) { m.On("pollTransaction", reqHash). Return(true, &types.Receipt{ ContractAddress: appContractAddress, - TxHash: txHash, + TxHash: txHash, }, nil) m.On("updateEpochWithSubmittedClaim", &currClaim, txHash). Return(nil) @@ -319,11 +319,11 @@ func TestUpdateFirstClaim(t *testing.T) { m := newServiceMock() appContractAddress := common.HexToAddress("0x01") currClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 3, - EpochFirstBlock: 30, - EpochLastBlock: 39, + EpochIndex: 3, + EpochFirstBlock: 30, + EpochLastBlock: 39, } var nilEvent *claimSubmissionEvent = nil @@ -356,18 +356,18 @@ func TestUpdateClaimWithAntecessor(t *testing.T) { m := newServiceMock() appContractAddress := common.HexToAddress("0x01") prevClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 1, - EpochFirstBlock: 10, - EpochLastBlock: 19, + EpochIndex: 1, + EpochFirstBlock: 10, + EpochLastBlock: 19, } currClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 3, - EpochFirstBlock: 30, - EpochLastBlock: 39, + EpochIndex: 3, + EpochFirstBlock: 30, + EpochLastBlock: 39, } prevEvent := claimSubmissionEvent{ @@ -411,18 +411,18 @@ func TestSubmitClaimWithAntecessorMismatch(t *testing.T) { appContractAddress := common.HexToAddress("0x01") claimTransactionHash := common.HexToHash("0x10") prevClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 1, - EpochFirstBlock: 10, - EpochLastBlock: 19, + EpochIndex: 1, + EpochFirstBlock: 10, + EpochLastBlock: 19, } currClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 3, - EpochFirstBlock: 30, - EpochLastBlock: 39, + EpochIndex: 3, + EpochFirstBlock: 30, + EpochLastBlock: 39, } prevClaims := map[address]claimRow{ @@ -454,18 +454,18 @@ func TestSubmitClaimWithEventMismatch(t *testing.T) { m := newServiceMock() appContractAddress := common.HexToAddress("0x01") prevClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 1, - EpochFirstBlock: 10, - EpochLastBlock: 19, + EpochIndex: 1, + EpochFirstBlock: 10, + EpochLastBlock: 19, } currClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 3, - EpochFirstBlock: 30, - EpochLastBlock: 39, + EpochIndex: 3, + EpochFirstBlock: 30, + EpochLastBlock: 39, } prevEvent := claimSubmissionEvent{ @@ -500,18 +500,18 @@ func TestSubmitClaimWithAntecessorOutOfOrder(t *testing.T) { appContractAddress := common.HexToAddress("0x01") claimTransactionHash := common.HexToHash("0x10") prevClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 2, - EpochFirstBlock: 20, - EpochLastBlock: 29, + EpochIndex: 2, + EpochFirstBlock: 20, + EpochLastBlock: 29, } currClaim := claimRow{ - AppContractAddress: appContractAddress, + AppContractAddress: appContractAddress, AppIConsensusAddress: appContractAddress, - EpochIndex: 1, - EpochFirstBlock: 10, - EpochLastBlock: 19, + EpochIndex: 1, + EpochFirstBlock: 10, + EpochLastBlock: 19, } prevClaims := map[address]claimRow{ @@ -537,4 +537,3 @@ func TestSubmitClaimWithAntecessorOutOfOrder(t *testing.T) { assert.Equal(t, len(errs), 1) assert.Equal(t, errs[0], ErrClaimMismatch) } - diff --git a/internal/evmreader/evmreader.go b/internal/evmreader/evmreader.go index 72fc9d5a7..1c4257b96 100644 --- a/internal/evmreader/evmreader.go +++ b/internal/evmreader/evmreader.go @@ -144,9 +144,9 @@ func (s *Service) String() string { } func (me *Service) SetupPersistentConfig( - ctx context.Context, + ctx context.Context, database *repository.Database, - c *model.EvmReaderPersistentConfig, + c *model.EvmReaderPersistentConfig, ) error { err := database.SelectEvmReaderConfig(ctx, c) if err == pgx.ErrNoRows { diff --git a/internal/node/services.go b/internal/node/services.go index 65e154fae..1ab25480d 100644 --- a/internal/node/services.go +++ b/internal/node/services.go @@ -90,7 +90,7 @@ func newAdvancerService(c config.NodeConfig, database *repository.Database, serv Impl: &advancerService, ProcOwner: true, // TODO: Remove this after updating supervisor LogLevel: service.LogLevel(c.LogLevel), - ServeMux: serveMux, + ServeMux: serveMux, }, Repository: database, } diff --git a/internal/repository/claimer_test.go b/internal/repository/claimer_test.go index 201bcf026..d4cd41093 100644 --- a/internal/repository/claimer_test.go +++ b/internal/repository/claimer_test.go @@ -65,20 +65,20 @@ func TestClaimerRepository(t *testing.T) { apps := []Application{ { - Id: 0, - ContractAddress: common.HexToAddress("0"), - Status: ApplicationStatusRunning, + Id: 0, + ContractAddress: common.HexToAddress("0"), + Status: ApplicationStatusRunning, }, { - Id: 1, - ContractAddress: common.HexToAddress("1"), - Status: ApplicationStatusRunning, + Id: 1, + ContractAddress: common.HexToAddress("1"), + Status: ApplicationStatusRunning, }, { - Id: 2, - ContractAddress: common.HexToAddress("2"), - Status: ApplicationStatusRunning, + Id: 2, + ContractAddress: common.HexToAddress("2"), + Status: ApplicationStatusRunning, }, } - for _, app := range(apps) { + for _, app := range apps { _, err = database.InsertApplication(ctx, &app) require.Nil(err) } @@ -141,7 +141,7 @@ func TestClaimerRepository(t *testing.T) { Status: EpochStatusClaimComputed, }, } - for _, epoch := range(epochs) { + for _, epoch := range epochs { _, err = database.InsertEpoch(ctx, &epoch) require.Nil(err) } @@ -165,20 +165,20 @@ func TestClaimerRepository(t *testing.T) { apps := []Application{ { - Id: 0, - ContractAddress: common.HexToAddress("0"), - Status: ApplicationStatusRunning, + Id: 0, + ContractAddress: common.HexToAddress("0"), + Status: ApplicationStatusRunning, }, { - Id: 1, - ContractAddress: common.HexToAddress("1"), - Status: ApplicationStatusRunning, + Id: 1, + ContractAddress: common.HexToAddress("1"), + Status: ApplicationStatusRunning, }, { - Id: 2, - ContractAddress: common.HexToAddress("2"), - Status: ApplicationStatusRunning, + Id: 2, + ContractAddress: common.HexToAddress("2"), + Status: ApplicationStatusRunning, }, } - for _, app := range(apps) { + for _, app := range apps { _, err = database.InsertApplication(ctx, &app) require.Nil(err) } @@ -241,7 +241,7 @@ func TestClaimerRepository(t *testing.T) { Status: EpochStatusClaimComputed, }, } - for _, epoch := range(epochs) { + for _, epoch := range epochs { _, err = database.InsertEpoch(ctx, &epoch) require.Nil(err) } diff --git a/internal/repository/evmreader.go b/internal/repository/evmreader.go index c3f35b56d..8309957f7 100644 --- a/internal/repository/evmreader.go +++ b/internal/repository/evmreader.go @@ -498,4 +498,3 @@ func (pg *Database) InsertEvmReaderConfig( return pg.db.Exec(ctx, query, args) } - diff --git a/pkg/service/log.go b/pkg/service/log.go index ea454a105..537d24a7c 100644 --- a/pkg/service/log.go +++ b/pkg/service/log.go @@ -7,6 +7,7 @@ import ( ) type LogLevel slog.Level + func (me LogLevel) String() string { return slog.Level(me).String() }