github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-30 03:01:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: make instance argument optional (#14389)

Browse Source 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Steven
2025-03-29 02:15:34 -06:00
committed by GitHub
parent e523bc2525
commit 5514dfef32
5 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/node/core/src/args/network.rs
View File

@@ -287,15 +287,17 @@ impl NetworkArgs {
self
}
/// Change networking port numbers based on the instance number.
/// Change networking port numbers based on the instance number, if provided.
/// Ports are updated to `previous_value + instance - 1`
///
/// # Panics
/// Warning: if `instance` is zero in debug mode, this will panic.
pub fn adjust_instance_ports(&mut self, instance: u16) {
debug_assert_ne!(instance, 0, "instance must be non-zero");
self.port += instance - 1;
self.discovery.adjust_instance_ports(instance);
pub fn adjust_instance_ports(&mut self, instance: Option<u16>) {
if let Some(instance) = instance {
debug_assert_ne!(instance, 0, "instance must be non-zero");
self.port += instance - 1;
self.discovery.adjust_instance_ports(instance);
}
}
/// Resolve all trusted peers at once

23
crates/node/core/src/args/rpc_server.rs
View File

@@ -230,7 +230,7 @@ impl RpcServerArgs {
self
}
/// Change rpc port numbers based on the instance number.
/// Change rpc port numbers based on the instance number, if provided.
/// * The `auth_port` is scaled by a factor of `instance * 100`
/// * The `http_port` is scaled by a factor of `-instance`
/// * The `ws_port` is scaled by a factor of `instance * 2`
@@ -244,17 +244,16 @@ impl RpcServerArgs {
/// * `self.auth_port / 100 + (instance - 1)` would overflow `u16`
///
/// In release mode, this will silently wrap around.
pub fn adjust_instance_ports(&mut self, instance: u16) {
debug_assert_ne!(instance, 0, "instance must be non-zero");
// auth port is scaled by a factor of instance * 100
self.auth_port += instance * 100 - 100;
// http port is scaled by a factor of -instance
self.http_port -= instance - 1;
// ws port is scaled by a factor of instance * 2
self.ws_port += instance * 2 - 2;
// if multiple instances are being run, append the instance number to the ipc path
if instance > 1 {
pub fn adjust_instance_ports(&mut self, instance: Option<u16>) {
if let Some(instance) = instance {
debug_assert_ne!(instance, 0, "instance must be non-zero");
// auth port is scaled by a factor of instance * 100
self.auth_port += instance * 100 - 100;
// http port is scaled by a factor of -instance
self.http_port -= instance - 1;
// ws port is scaled by a factor of instance * 2
self.ws_port += instance * 2 - 2;
// append instance file to ipc path
self.ipcpath = format!("{}-{}", self.ipcpath, instance);
}
}