review comment

0xPolygon · Jan 21, 2025 · 1413a01 · 1413a01
1 parent 34a6434
commit 1413a01
Show file tree

Hide file tree

Showing 37 changed files with 698 additions and 12 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -3,7 +3,7 @@ issue-845-fix: true
 resolve-type-alias: false
 dir: "{{ .InterfaceDir }}/../mocks"
 outpkg: "mocks"
-filename: "{{ .InterfaceName | snakecase | lower }}.go"
+filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
 mockname: "{{ .InterfaceName }}"
 packages:
   github.com/0xPolygon/cdk/agglayer:
@@ -15,19 +15,16 @@ packages:
       AgglayerClientInterface:
         config:
           mockname: AgglayerClientMock
-          filename: mock_agglayer_client.go
   github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer:
     config:
     interfaces:
       Synchronizer:
         config:
           dir: "./aggregator/mocks"
           mockname: "{{ .InterfaceName }}InterfaceMock"
-          filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
   github.com/0xPolygon/cdk/aggregator:
     config:
       dir: "{{ .InterfaceDir }}/mocks"
-      filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
       mockname: "{{ .InterfaceName }}Mock"
     interfaces:
       ProverInterface:
@@ -42,7 +39,6 @@ packages:
       AggregatorService_ChannelServer:
         config:
           mockname: ChannelMock
-          filename: mock_channel.go
   github.com/0xPolygon/cdk/bridgesync:
     config:
       dir: "{{ .InterfaceDir }}/mocks"
@@ -57,7 +53,6 @@ packages:
   github.com/0xPolygon/cdk/db:
     config:
       dir: "{{ .InterfaceDir }}/../aggregator/mocks"
-      filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
       mockname: "{{ .InterfaceName }}Mock"
     interfaces:
       Txer:
@@ -71,7 +66,6 @@ packages:
       dir: "{{ .InterfaceDir }}"
       outpkg: "{{ .PackageName }}"
       mockname: "{{ .InterfaceName }}Mock"
-      filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
     interfaces:
       EthClient:
   github.com/0xPolygon/cdk/rpc/client:
@@ -97,9 +91,7 @@ packages:
       EthTxManager:
         configs:
           - mockname: EthTxManagerMock
-            filename: mock_ethtxmanager.go
           - mockname: EthTxManagerMock
-            filename: mock_ethtxmanager.go
             dir: "{{ .InterfaceDir }}/../test/helpers"
             outpkg: "helpers"
       Etherman:
@@ -124,20 +116,17 @@ packages:
       dir: "{{ .InterfaceDir }}"
       outpkg: "{{ .PackageName }}"
       mockname: "{{ .InterfaceName }}Mock"
-      filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
       inpackage: true
     interfaces:
       ReorgDetector:
         configs:
           - dir: "{{ .InterfaceDir }}/../l1infotreesync/mocks"
             outpkg: "mocks"
             mockname: "{{ .InterfaceName }}Mock"
-            filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
             inpackage: false
           - dir: "{{ .InterfaceDir }}"
             outpkg: "{{ .PackageName }}"
             mockname: "{{ .InterfaceName }}Mock"
-            filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
       processorInterface:
         config:
           mockname: "ProcessorMock"

diff --git a/agglayer/mock_agglayer_client.go → agglayer/mock_agglayer_client_interface.go b/agglayer/mock_agglayer_client.go → agglayer/mock_agglayer_client_interface.go
diff --git a/aggregator/prover/mocks/mock_channel.go → ...mock_aggregator_service_channel_server.go b/aggregator/prover/mocks/mock_channel.go → ...mock_aggregator_service_channel_server.go
diff --git a/bridgesync/mocks/eth_clienter.go → bridgesync/mocks/mock_eth_clienter.go b/bridgesync/mocks/eth_clienter.go → bridgesync/mocks/mock_eth_clienter.go
diff --git a/bridgesync/mocks/reorg_detector.go → bridgesync/mocks/mock_reorg_detector.go b/bridgesync/mocks/reorg_detector.go → bridgesync/mocks/mock_reorg_detector.go
diff --git a/...ilability/mocks_da/batch_data_provider.go → ...lity/mocks_da/mock_batch_data_provider.go b/...ilability/mocks_da/batch_data_provider.go → ...lity/mocks_da/mock_batch_data_provider.go
diff --git a/dataavailability/mocks_da/da_backender.go → ...vailability/mocks_da/mock_da_backender.go b/dataavailability/mocks_da/da_backender.go → ...vailability/mocks_da/mock_da_backender.go
diff --git a/dataavailability/mocks_da/data_manager.go → ...vailability/mocks_da/mock_data_manager.go b/dataavailability/mocks_da/data_manager.go → ...vailability/mocks_da/mock_data_manager.go
diff --git a/...ailability/mocks_da/sequence_retriever.go → ...ility/mocks_da/mock_sequence_retriever.go b/...ailability/mocks_da/sequence_retriever.go → ...ility/mocks_da/mock_sequence_retriever.go
diff --git a/dataavailability/mocks_da/sequence_sender.go → ...lability/mocks_da/mock_sequence_sender.go b/dataavailability/mocks_da/sequence_sender.go → ...lability/mocks_da/mock_sequence_sender.go
diff --git a/...bility/mocks_da/sequence_sender_banana.go → ...y/mocks_da/mock_sequence_sender_banana.go b/...bility/mocks_da/sequence_sender_banana.go → ...y/mocks_da/mock_sequence_sender_banana.go
diff --git a/...ty/mocks_da/sequence_sender_elderberry.go → ...cks_da/mock_sequence_sender_elderberry.go b/...ty/mocks_da/sequence_sender_elderberry.go → ...cks_da/mock_sequence_sender_elderberry.go
diff --git a/l1infotreesync/mocks/eth_clienter.go → l1infotreesync/mocks/mock_eth_clienter.go b/l1infotreesync/mocks/eth_clienter.go → l1infotreesync/mocks/mock_eth_clienter.go
diff --git a/rpc/mocks/bridge_client_interface.go → rpc/mocks/mock_bridge_client_interface.go b/rpc/mocks/bridge_client_interface.go → rpc/mocks/mock_bridge_client_interface.go
diff --git a/rpc/mocks/bridger.go → rpc/mocks/mock_bridger.go b/rpc/mocks/bridger.go → rpc/mocks/mock_bridger.go
diff --git a/rpc/mocks/claim_sponsorer.go → rpc/mocks/mock_claim_sponsorer.go b/rpc/mocks/claim_sponsorer.go → rpc/mocks/mock_claim_sponsorer.go
diff --git a/rpc/mocks/client_factory_interface.go → rpc/mocks/mock_client_factory_interface.go b/rpc/mocks/client_factory_interface.go → rpc/mocks/mock_client_factory_interface.go
diff --git a/rpc/mocks/client_interface.go → rpc/mocks/mock_client_interface.go b/rpc/mocks/client_interface.go → rpc/mocks/mock_client_interface.go
diff --git a/rpc/mocks/l1_info_treer.go → rpc/mocks/mock_l1_info_treer.go b/rpc/mocks/l1_info_treer.go → rpc/mocks/mock_l1_info_treer.go
diff --git a/rpc/mocks/last_ge_rer.go → rpc/mocks/mock_last_ge_rer.go b/rpc/mocks/last_ge_rer.go → rpc/mocks/mock_last_ge_rer.go
diff --git a/sequencesender/mocks/mock_ethtxmanager.go → sequencesender/mocks/mock_eth_tx_manager.go b/sequencesender/mocks/mock_ethtxmanager.go → sequencesender/mocks/mock_eth_tx_manager.go
diff --git a/sequencesender/mocks/etherman.go → sequencesender/mocks/mock_etherman.go b/sequencesender/mocks/etherman.go → sequencesender/mocks/mock_etherman.go
diff --git a/sequencesender/mocks/rpc_interface.go → sequencesender/mocks/mock_rpc_interface.go b/sequencesender/mocks/rpc_interface.go → sequencesender/mocks/mock_rpc_interface.go
diff --git a/sequencesender/mocks/tx_builder.go → sequencesender/mocks/mock_tx_builder.go b/sequencesender/mocks/tx_builder.go → sequencesender/mocks/mock_tx_builder.go
diff --git a/...lder/mocks_txbuilder/cond_new_sequence.go → ...mocks_txbuilder/mock_cond_new_sequence.go b/...lder/mocks_txbuilder/cond_new_sequence.go → ...mocks_txbuilder/mock_cond_new_sequence.go
diff --git a/...der/global_exit_root_banana_contractor.go → ...ock_global_exit_root_banana_contractor.go b/...der/global_exit_root_banana_contractor.go → ...ock_global_exit_root_banana_contractor.go
diff --git a/...obal_exit_root_banana_zkevm_contractor.go → ...obal_exit_root_banana_zkevm_contractor.go b/...obal_exit_root_banana_zkevm_contractor.go → ...obal_exit_root_banana_zkevm_contractor.go
diff --git a/...er/txbuilder/mocks_txbuilder/l1_client.go → ...builder/mocks_txbuilder/mock_l1_client.go b/...er/txbuilder/mocks_txbuilder/l1_client.go → ...builder/mocks_txbuilder/mock_l1_client.go
diff --git a/...builder/mocks_txbuilder/l1_info_syncer.go → ...er/mocks_txbuilder/mock_l1_info_syncer.go b/...builder/mocks_txbuilder/l1_info_syncer.go → ...er/mocks_txbuilder/mock_l1_info_syncer.go
diff --git a/...xbuilder/rollup_banana_base_contractor.go → ...der/mock_rollup_banana_base_contractor.go b/...xbuilder/rollup_banana_base_contractor.go → ...der/mock_rollup_banana_base_contractor.go
diff --git a/...lder/rollup_banana_validium_contractor.go → ...mock_rollup_banana_validium_contractor.go b/...lder/rollup_banana_validium_contractor.go → ...mock_rollup_banana_validium_contractor.go
diff --git a/...builder/rollup_banana_zkevm_contractor.go → ...er/mock_rollup_banana_zkevm_contractor.go b/...builder/rollup_banana_zkevm_contractor.go → ...er/mock_rollup_banana_zkevm_contractor.go
diff --git a/.../rollup_elderberry_validium_contractor.go → ..._rollup_elderberry_validium_contractor.go b/.../rollup_elderberry_validium_contractor.go → ..._rollup_elderberry_validium_contractor.go
diff --git a/...der/rollup_elderberry_zkevm_contractor.go → ...ock_rollup_elderberry_zkevm_contractor.go b/...der/rollup_elderberry_zkevm_contractor.go → ...ock_rollup_elderberry_zkevm_contractor.go
diff --git a/...r/txbuilder/mocks_txbuilder/tx_builder.go → ...uilder/mocks_txbuilder/mock_tx_builder.go b/...r/txbuilder/mocks_txbuilder/tx_builder.go → ...uilder/mocks_txbuilder/mock_tx_builder.go