[Narwhal] remove configs for external consensus (MystenLabs#12960)

## Description Remove configs that are no longer used. ## Test Plan CI. Deployed to private testnet, restarted sui-node (no longer supporting consensus grpc api and block synchronizer settings) with the deleted settings added back. --- If your changes are not user-facing and not a breaking change, you can skip the following section. Otherwise, please indicate what changed, and then add to the Release Notes section as highlighted during the release process. ### Type of Change (Check all that apply) - [ ] protocol change - [ ] user-visible impact - [ ] breaking change for a client SDKs - [ ] breaking change for FNs (FN binary must upgrade) - [ ] breaking change for validators or node operators (must upgrade binaries) - [ ] breaking change for on-chain data layout - [ ] necessitate either a data wipe or data migration ### Release notes
a00012025 · Jul 12, 2023 · 5fad5db · 5fad5db
1 parent 51ff68c
commit 5fad5db
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 367 deletions.
diff --git a/crates/sui-swarm-config/tests/snapshot_tests.rs b/crates/sui-swarm-config/tests/snapshot_tests.rs
@@ -134,10 +134,6 @@ fn network_config_snapshot_matches() {
             consensus_config.address = Multiaddr::empty();
             consensus_config.db_path = PathBuf::from("/tmp/foo/");
             consensus_config.internal_worker_address = Some(Multiaddr::empty());
-            consensus_config
-                .narwhal_config
-                .consensus_api_grpc
-                .socket_addr = Multiaddr::empty();
             consensus_config
                 .narwhal_config
                 .prometheus_metrics

diff --git a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
@@ -33,16 +33,6 @@ validator_configs:
         sync_retry_nodes: 3
         batch_size: 5000000
         max_batch_delay: 100ms
-        block_synchronizer:
-          range_synchronize_timeout: 30000ms
-          certificates_synchronize_timeout: 30000ms
-          payload_synchronize_timeout: 30000ms
-          payload_availability_timeout: 30000ms
-          handler_certificate_deliver_timeout: 30000ms
-        consensus_api_grpc:
-          socket_addr: ""
-          get_collections_timeout: 5000ms
-          remove_collections_timeout: 5000ms
         max_concurrent_requests: 500000
         prometheus_metrics:
           socket_addr: /ip4/127.0.0.1/tcp/1234
@@ -127,16 +117,6 @@ validator_configs:
         sync_retry_nodes: 3
         batch_size: 5000000
         max_batch_delay: 100ms
-        block_synchronizer:
-          range_synchronize_timeout: 30000ms
-          certificates_synchronize_timeout: 30000ms
-          payload_synchronize_timeout: 30000ms
-          payload_availability_timeout: 30000ms
-          handler_certificate_deliver_timeout: 30000ms
-        consensus_api_grpc:
-          socket_addr: ""
-          get_collections_timeout: 5000ms
-          remove_collections_timeout: 5000ms
         max_concurrent_requests: 500000
         prometheus_metrics:
           socket_addr: /ip4/127.0.0.1/tcp/1234
@@ -221,16 +201,6 @@ validator_configs:
         sync_retry_nodes: 3
         batch_size: 5000000
         max_batch_delay: 100ms
-        block_synchronizer:
-          range_synchronize_timeout: 30000ms
-          certificates_synchronize_timeout: 30000ms
-          payload_synchronize_timeout: 30000ms
-          payload_availability_timeout: 30000ms
-          handler_certificate_deliver_timeout: 30000ms
-        consensus_api_grpc:
-          socket_addr: ""
-          get_collections_timeout: 5000ms
-          remove_collections_timeout: 5000ms
         max_concurrent_requests: 500000
         prometheus_metrics:
           socket_addr: /ip4/127.0.0.1/tcp/1234
@@ -315,16 +285,6 @@ validator_configs:
         sync_retry_nodes: 3
         batch_size: 5000000
         max_batch_delay: 100ms
-        block_synchronizer:
-          range_synchronize_timeout: 30000ms
-          certificates_synchronize_timeout: 30000ms
-          payload_synchronize_timeout: 30000ms
-          payload_availability_timeout: 30000ms
-          handler_certificate_deliver_timeout: 30000ms
-        consensus_api_grpc:
-          socket_addr: ""
-          get_collections_timeout: 5000ms
-          remove_collections_timeout: 5000ms
         max_concurrent_requests: 500000
         prometheus_metrics:
           socket_addr: /ip4/127.0.0.1/tcp/1234
@@ -409,16 +369,6 @@ validator_configs:
         sync_retry_nodes: 3
         batch_size: 5000000
         max_batch_delay: 100ms
-        block_synchronizer:
-          range_synchronize_timeout: 30000ms
-          certificates_synchronize_timeout: 30000ms
-          payload_synchronize_timeout: 30000ms
-          payload_availability_timeout: 30000ms
-          handler_certificate_deliver_timeout: 30000ms
-        consensus_api_grpc:
-          socket_addr: ""
-          get_collections_timeout: 5000ms
-          remove_collections_timeout: 5000ms
         max_concurrent_requests: 500000
         prometheus_metrics:
           socket_addr: /ip4/127.0.0.1/tcp/1234
@@ -503,16 +453,6 @@ validator_configs:
         sync_retry_nodes: 3
         batch_size: 5000000
         max_batch_delay: 100ms
-        block_synchronizer:
-          range_synchronize_timeout: 30000ms
-          certificates_synchronize_timeout: 30000ms
-          payload_synchronize_timeout: 30000ms
-          payload_availability_timeout: 30000ms
-          handler_certificate_deliver_timeout: 30000ms
-        consensus_api_grpc:
-          socket_addr: ""
-          get_collections_timeout: 5000ms
-          remove_collections_timeout: 5000ms
         max_concurrent_requests: 500000
         prometheus_metrics:
           socket_addr: /ip4/127.0.0.1/tcp/1234
@@ -597,16 +537,6 @@ validator_configs:
         sync_retry_nodes: 3
         batch_size: 5000000
         max_batch_delay: 100ms
-        block_synchronizer:
-          range_synchronize_timeout: 30000ms
-          certificates_synchronize_timeout: 30000ms
-          payload_synchronize_timeout: 30000ms
-          payload_availability_timeout: 30000ms
-          handler_certificate_deliver_timeout: 30000ms
-        consensus_api_grpc:
-          socket_addr: ""
-          get_collections_timeout: 5000ms
-          remove_collections_timeout: 5000ms
         max_concurrent_requests: 500000
         prometheus_metrics:
           socket_addr: /ip4/127.0.0.1/tcp/1234

diff --git a/narwhal/Docker/validators/parameters.json b/narwhal/Docker/validators/parameters.json
@@ -1,10 +1,5 @@
 {
     "batch_size": 500000,
-    "consensus_api_grpc": {
-        "get_collections_timeout": "5_000ms",
-        "remove_collections_timeout": "5_000ms",
-        "socket_addr": "/ip4/0.0.0.0/tcp/8000/http"
-    },
     "gc_depth": 50,
     "header_num_of_batches_threshold": 32,
     "max_header_num_of_batches": 1000,

diff --git a/narwhal/benchmark/README.md b/narwhal/benchmark/README.md
@@ -46,18 +46,6 @@ node_params = {
     'sync_retry_nodes': 3,
     'batch_size': 500_000,
     'max_batch_delay': '100ms',
-    'block_synchronizer': {
-        'range_synchronize_timeout': '30s',
-        'certificates_synchronize_timeout': '30s',
-        'payload_synchronize_timeout': '30s',
-        'payload_availability_timeout': '30s',
-        'handler_certificate_deliver_timeout': '30s'
-    },
-    "consensus_api_grpc": {
-        "socket_addr": "/ip4/127.0.0.1/tcp/0/http",
-        "get_collections_timeout": "5_000ms",
-        "remove_collections_timeout": "5_000ms"
-    },
     'max_concurrent_requests': 500_000
 }
 ```

diff --git a/narwhal/benchmark/fabfile.py b/narwhal/benchmark/fabfile.py
@@ -33,18 +33,6 @@ def local(ctx, debug=True):
         'sync_retry_nodes': 3,  # number of nodes
         'batch_size': 500_000,  # bytes
         'max_batch_delay': '200ms',  # ms,
-        'block_synchronizer': {
-            'range_synchronize_timeout': '30_000ms',
-            'certificates_synchronize_timeout': '2_000ms',
-            'payload_synchronize_timeout': '2_000ms',
-            'payload_availability_timeout': '2_000ms',
-            'handler_certificate_deliver_timeout': '2_000ms'
-        },
-        "consensus_api_grpc": {
-            "socket_addr": "/ip4/127.0.0.1/tcp/0/http",
-            "get_collections_timeout": "5_000ms",
-            "remove_collections_timeout": "5_000ms"
-        },
         'max_concurrent_requests': 500_000,
         'prometheus_metrics': {
             "socket_addr": "/ip4/127.0.0.1/tcp/0/http"
@@ -82,18 +70,6 @@ def smoke(ctx, debug=True, release=False):
         'sync_retry_nodes': 3,  # number of nodes
         'batch_size': 500_000,  # bytes
         'max_batch_delay': '200ms',  # ms,
-        'block_synchronizer': {
-            'range_synchronize_timeout': '30_000ms',
-            'certificates_synchronize_timeout': '2_000ms',
-            'payload_synchronize_timeout': '2_000ms',
-            'payload_availability_timeout': '2_000ms',
-            'handler_certificate_deliver_timeout': '2_000ms'
-        },
-        "consensus_api_grpc": {
-            "socket_addr": "/ip4/127.0.0.1/tcp/0/http",
-            "get_collections_timeout": "5_000ms",
-            "remove_collections_timeout": "5_000ms"
-        },
         'max_concurrent_requests': 500_000,
         'prometheus_metrics': {
             "socket_addr": "/ip4/127.0.0.1/tcp/0/http"
@@ -132,18 +108,6 @@ def failpoints(ctx, debug=True):
         'sync_retry_nodes': 3,  # number of nodes
         'batch_size': 500_000,  # bytes
         'max_batch_delay': '200ms',  # ms,
-        'block_synchronizer': {
-            'range_synchronize_timeout': '30_000ms',
-            'certificates_synchronize_timeout': '2_000ms',
-            'payload_synchronize_timeout': '2_000ms',
-            'payload_availability_timeout': '2_000ms',
-            'handler_certificate_deliver_timeout': '2_000ms'
-        },
-        "consensus_api_grpc": {
-            "socket_addr": "/ip4/127.0.0.1/tcp/0/http",
-            "get_collections_timeout": "5_000ms",
-            "remove_collections_timeout": "5_000ms"
-        },
         'max_concurrent_requests': 500_000,
         'prometheus_metrics': {
             "socket_addr": "/ip4/127.0.0.1/tcp/0/http"
@@ -175,19 +139,6 @@ def demo(ctx, debug=True):
     }
     node_params = {
         "batch_size": 500000,
-        "block_synchronizer": {
-            'range_synchronize_timeout': '30_000ms',
-            "certificates_synchronize_timeout": "2_000ms",
-            "handler_certificate_deliver_timeout": "2_000ms",
-            "payload_availability_timeout": "2_000ms",
-            "payload_synchronize_timeout": "2_000ms"
-        },
-        "consensus_api_grpc": {
-            "get_collections_timeout": "5_000ms",
-            "remove_collections_timeout": "5_000ms",
-            # Use a random available local port.
-            "socket_addr": "/ip4/0.0.0.0/tcp/0/http"
-        },
         "gc_depth": 50,  # rounds
         'header_num_of_batches_threshold': 32,
         "max_header_num_of_batches": 1000,
@@ -306,18 +257,6 @@ def remote(ctx, debug=False):
         'sync_retry_nodes': 3,  # number of nodes
         'batch_size': 500_000,  # bytes
         'max_batch_delay': '200ms',  # ms,
-        'block_synchronizer': {
-            'range_synchronize_timeout': '30_000ms',
-            'certificates_synchronize_timeout': '2_000ms',
-            'payload_synchronize_timeout': '2_000ms',
-            'payload_availability_timeout': '2_000ms',
-            'handler_certificate_deliver_timeout': '2_000ms'
-        },
-        "consensus_api_grpc": {
-            "socket_addr": "/ip4/127.0.0.1/tcp/0/http",
-            "get_collections_timeout": "5_000ms",
-            "remove_collections_timeout": "5_000ms"
-        },
         'max_concurrent_requests': 500_000,
         'prometheus_metrics': {
             "socket_addr": "/ip4/0.0.0.0/tcp/0/http"