parametrize enabling gossip and enable for both validator and fullnode

crates/sui-config/src/builder.rs

@@ -191,6 +191,7 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
                     json_rpc_address: utils::available_local_socket_address(),
                     consensus_config: Some(consensus_config),
                     enable_event_processing: false,
+                    enable_gossip: true,
                     genesis: crate::node::Genesis::new(genesis.clone()),
                 }
             })

crates/sui-config/src/node.rs

@@ -36,6 +36,9 @@ pub struct NodeConfig {
     #[serde(default)]
     pub enable_event_processing: bool,
 
+    #[serde(default)]
+    pub enable_gossip: bool,
+
     pub genesis: Genesis,
 }
 

crates/sui-config/src/swarm.rs

@@ -70,6 +70,7 @@ impl NetworkConfig {
             json_rpc_address: utils::available_local_socket_address(),
             consensus_config: None,
             enable_event_processing: true,
+            enable_gossip: true,
             genesis: validator_config.genesis.clone(),
         }
     }

crates/sui-core/src/authority_active.rs

@@ -234,10 +234,8 @@ where
         let active = Arc::new(self);
 
         let gossip_locals = active;
-        let gossip_join = tokio::task::spawn(async move {
+        tokio::task::spawn(async move {
             gossip_process(&gossip_locals, degree).await;
-        });
-
-        gossip_join
+        })
     }
 }

crates/sui-node/src/lib.rs

@@ -75,9 +75,7 @@ impl SuiNode {
             .await,
         );
 
-        let gossip_handle = if config.consensus_config().is_some() {
-            None
-        } else {
+        let gossip_handle = if config.enable_gossip {
             let mut net_config = mysten_network::config::Config::new();
             net_config.connect_timeout = Some(Duration::from_secs(5));
             net_config.request_timeout = Some(Duration::from_secs(5));
@@ -104,6 +102,8 @@ impl SuiNode {
                 )
                 .await;
             Some(handle)
+        } else {
+            None
         };
 
         let batch_subsystem_handle = {