refactored sequencer and fix aggr cfg value (0xPolygonHermez#1079)

* refactored sequencer and fix aggr cfg value * fixed lint err
alagbe003 · Aug 24, 2022 · 14846a8 · 14846a8
1 parent d386586
commit 14846a8
Show file tree

Hide file tree

Showing 17 changed files with 366 additions and 271 deletions.
diff --git a/Makefile b/Makefile
@@ -294,10 +294,10 @@ generate-mocks: ## Generates mocks for the tests, using mockery tool
 	mockery --name=stateInterface --dir=jsonrpc --output=jsonrpc --outpkg=jsonrpc --inpackage --structname=stateMock --filename=mock_state_test.go
 	mockery --name=Tx --srcpkg=github.com/jackc/pgx/v4 --output=jsonrpc --outpkg=jsonrpc --structname=dbTxMock --filename=mock_dbtx_test.go
 
-	mockery --name=txManager --dir=sequencer --output=sequencer --outpkg=sequencer --structname=txmanagerMock --filename=txmanager-mock_test.go
-	mockery --name=etherman --dir=sequencer --output=sequencer --outpkg=sequencer --structname=ethermanMock --filename=etherman-mock_test.go
-	mockery --name=etherman --dir=sequencer/profitabilitychecker --output=sequencer/profitabilitychecker --outpkg=profitabilitychecker_test --structname=ethermanMock --filename=etherman-mock_test.go
-	mockery --name=stateInterface --dir=sequencer/broadcast --output=sequencer/broadcast --outpkg=broadcast_test --structname=stateMock --filename=state-mock_test.go
+	mockery --name=txManager --dir=sequencer --output=sequencer/mocks --outpkg=mocks --structname=TxmanagerMock --filename=mock_txmanager.go
+	mockery --name=etherman --dir=sequencer --output=sequencer/mocks --outpkg=mocks --structname=EthermanMock --filename=mock_etherman.go
+	mockery --name=etherman --dir=sequencer/profitabilitychecker --output=sequencer/profitabilitychecker/mocks --outpkg=mocks --structname=EthermanMock --filename=mock_etherman.go
+	mockery --name=stateInterface --dir=sequencer/broadcast --output=sequencer/broadcast/mocks --outpkg=mocks --structname=StateMock --filename=mock_state.go
 
 	mockery --name=ethermanInterface --dir=synchronizer --output=synchronizer --outpkg=synchronizer --structname=ethermanMock --filename=mock_etherman.go
 	mockery --name=stateInterface --dir=synchronizer --output=synchronizer --outpkg=synchronizer --structname=stateMock --filename=mock_state.go

diff --git a/aggregator/aggregator.go b/aggregator/aggregator.go
@@ -51,7 +51,7 @@ func NewAggregator(
 		State:                state,
 		EthTxManager:         ethTxManager,
 		Ethman:               etherman,
-		ProverClient:         prover.NewClient(zkProverClient),
+		ProverClient:         prover.NewClient(zkProverClient, cfg.IntervalFrequencyToGetProofGenerationState),
 		ProfitabilityChecker: profitabilityChecker,
 	}
 

diff --git a/aggregator/config.go b/aggregator/config.go
@@ -36,7 +36,7 @@ type Config struct {
 
 	// IntervalFrequencyToGetProofGenerationStateInSeconds is the time the aggregator waits until
 	// trying to get proof generation status, in case prover client returns PENDING state
-	IntervalFrequencyToGetProofGenerationStateInSeconds types.Duration `mapstructure:"IntervalFrequencyToGetProofGenerationStateInSeconds"`
+	IntervalFrequencyToGetProofGenerationState types.Duration `mapstructure:"IntervalFrequencyToGetProofGenerationState"`
 
 	// TxProfitabilityCheckerType type for checking is it profitable for aggregator to validate batch
 	// possible values: base/acceptall

diff --git a/aggregator/prover/client.go b/aggregator/prover/client.go
@@ -13,13 +13,16 @@ import (
 
 // Client wrapper for the zkprover client
 type Client struct {
-	ZkProverClient                                      pb.ZKProverServiceClient
-	IntervalFrequencyToGetProofGenerationStateInSeconds types.Duration
+	ZkProverClient                             pb.ZKProverServiceClient
+	IntervalFrequencyToGetProofGenerationState types.Duration
 }
 
 // NewClient inits zkprover wrapper client
-func NewClient(pc pb.ZKProverServiceClient) *Client {
-	return &Client{ZkProverClient: pc}
+func NewClient(pc pb.ZKProverServiceClient, intervalFrequencyToGetProofGenerationState types.Duration) *Client {
+	return &Client{
+		ZkProverClient: pc,
+		IntervalFrequencyToGetProofGenerationState: intervalFrequencyToGetProofGenerationState,
+	}
 }
 
 // GetGenProofID get id of generation proof request
@@ -80,7 +83,7 @@ func (c *Client) GetResGetProof(ctx context.Context, genProofID string, batchNum
 
 		if resGetProofState == pb.GetProofResponse_RESULT_GET_PROOF_PENDING {
 			// in this case aggregator will wait, to send another request
-			time.Sleep(c.IntervalFrequencyToGetProofGenerationStateInSeconds.Duration)
+			time.Sleep(c.IntervalFrequencyToGetProofGenerationState.Duration)
 		}
 	}
 

diff --git a/config/config.debug.toml b/config/config.debug.toml
@@ -52,7 +52,7 @@ MaxSteps = 8388608
 
 [Aggregator]
 IntervalToConsolidateState = "10s"
-IntervalFrequencyToGetProofGenerationStateInSeconds = "5s"
+IntervalFrequencyToGetProofGenerationState = "5s"
 TxProfitabilityCheckerType = "acceptall"
 TxProfitabilityMinReward = "1.1"
 

diff --git a/config/config.local.toml b/config/config.local.toml
@@ -52,7 +52,7 @@ MaxSteps = 8388608
 
 [Aggregator]
 IntervalToConsolidateState = "10s"
-IntervalFrequencyToGetProofGenerationStateInSeconds = "5s"
+IntervalFrequencyToGetProofGenerationState = "5s"
 TxProfitabilityCheckerType = "acceptall"
 TxProfitabilityMinReward = "1.1"
 

diff --git a/config/default.go b/config/default.go
@@ -65,7 +65,7 @@ Type = "default"
 DefaultPrice = "2000"
 
 [Aggregator]
-IntervalFrequencyToGetProofGenerationStateInSeconds = "5s"
+IntervalFrequencyToGetProofGenerationState = "5s"
 IntervalToConsolidateState = "3s"
 TxProfitabilityCheckerType = "acceptall"
 TxProfitabilityMinReward = "1.1"