tweak: apply review comments

Signed-off-by: ljedrz <ljedrz@users.noreply.github.com>

Author: ljedrz

cli/src/commands/start.rs

@@ -156,6 +156,7 @@ pub struct Start {
     pub bft: Option<SocketAddr>,
 
     /// Set the IP address and port used for providing block synchronization.
+    /// The default is 0.0.0.0:6130 if not specified.
     #[clap(long = "sync-listener")]
     pub sync_listener: Option<SocketAddr>,
 
@@ -512,7 +513,7 @@ impl Start {
         }
 
         if self.sync_listener.is_none() {
-            let port = get_devnet_router_address_for_node(dev).port() + 2000; // 6130+
+            let port = get_devnet_sync_address_for_node(dev).port();
             let address = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, port));
             debug!("Setting sync listener address to {address} due to dev={dev}");
             self.sync_listener = Some(address);

cli/src/helpers/dev.rs

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use snarkos_node::{bft::MEMORY_POOL_PORT, router::DEFAULT_NODE_PORT};
+use snarkos_node::{bft::MEMORY_POOL_PORT, network::DEFAULT_SYNC_PORT, router::DEFAULT_NODE_PORT};
 
 use snarkvm::{console::network::Network, prelude::PrivateKey};
 
@@ -58,3 +58,8 @@ pub fn get_devnet_gateway_address_for_validator(dev: u16) -> SocketAddr {
 pub fn get_devnet_router_address_for_node(dev: u16) -> SocketAddr {
     SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::LOCALHOST, DEFAULT_NODE_PORT + dev))
 }
+
+/// Returns the router address a particular devnet validator will list on.
+pub fn get_devnet_sync_address_for_node(dev: u16) -> SocketAddr {
+    SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::LOCALHOST, DEFAULT_SYNC_PORT + dev))
+}

node/network/src/lib.rs

@@ -58,6 +58,9 @@ pub mod built_info {
     include!(concat!(env!("OUT_DIR"), "/built.rs"));
 }
 
+/// The default port used for the sync streams.
+pub const DEFAULT_SYNC_PORT: u16 = 6130;
+
 /// Returns the list of bootstrap peers.
 #[allow(clippy::if_same_then_else)]
 pub fn bootstrap_peers<N: Network>(is_dev: bool) -> Vec<SocketAddr> {

node/sync/src/helpers/sync_channel.rs

@@ -26,14 +26,14 @@ const MAX_CHANNEL_SIZE: usize = 8192;
 
 #[derive(Clone, Debug)]
 pub struct SyncSender<N: Network> {
-    pub tx_block_sync_insert_block_response: mpsc::Sender<(
+    tx_block_sync_insert_block_response: mpsc::Sender<(
         SocketAddr,
         Vec<Block<N>>,
         Option<ConsensusVersion>,
         oneshot::Sender<Result<(), InsertBlockResponseError<N>>>,
     )>,
     pub tx_block_sync_remove_peer: mpsc::Sender<(SocketAddr, oneshot::Sender<()>)>,
-    pub tx_block_sync_update_peer_locators: mpsc::Sender<(SocketAddr, BlockLocators<N>, oneshot::Sender<Result<()>>)>,
+    tx_block_sync_update_peer_locators: mpsc::Sender<(SocketAddr, BlockLocators<N>, oneshot::Sender<Result<()>>)>,
     pub tx_certificate_request: mpsc::Sender<(SocketAddr, CertificateRequest<N>)>,
     pub tx_certificate_response: mpsc::Sender<(SocketAddr, CertificateResponse<N>)>,
 }