Skip to content

Commit

Permalink
refactor: code format
Browse files Browse the repository at this point in the history
  • Loading branch information
@mpolitzer
mpolitzer committed Dec 10, 2024
1 parent df4ac28 commit 5a3e8eb
Show file tree
Hide file tree
Showing 11 changed files with 103 additions and 106 deletions.
10 changes: 5 additions & 5 deletions cmd/cartesi-rollups-evm-reader/root/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions internal/advancer/advancer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -212,4 +212,3 @@ func (advancer *Advancer) process(ctx context.Context, app Address, inputs []*In

return nil
}

2 changes: 1 addition & 1 deletion internal/advancer/advancer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion internal/advancer/machines/machines_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ type machinesMock struct {
mock.Mock
Machines
}

10 changes: 5 additions & 5 deletions internal/claimer/claimer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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()
}

Expand Down
131 changes: 65 additions & 66 deletions internal/claimer/claimer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand All @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand All @@ -537,4 +537,3 @@ func TestSubmitClaimWithAntecessorOutOfOrder(t *testing.T) {
assert.Equal(t, len(errs), 1)
assert.Equal(t, errs[0], ErrClaimMismatch)
}

4 changes: 2 additions & 2 deletions internal/evmreader/evmreader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/node/services.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
Loading

0 comments on commit 5a3e8eb

Please sign in to comment.