summaryrefslogtreecommitdiffstats
path: root/src/transport/mycelium.rs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2026-10-21 14:51:51 +0200
committertv <tv@krebsco.de>2026-10-21 14:51:51 +0200
commit98ca55ee593c1d073241a295c9aba513e8e96e99 (patch)
tree0e9d361b832cb3e0c0b69c760c40ae1187d23c9a /src/transport/mycelium.rs
parent540a344b811885551ad5ed374e0abe3411554b9d (diff)
rename cluster to swarm everywhere!
Diffstat (limited to 'src/transport/mycelium.rs')
-rw-r--r--src/transport/mycelium.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/transport/mycelium.rs b/src/transport/mycelium.rs
index a8a0e10..194f998 100644
--- a/src/transport/mycelium.rs
+++ b/src/transport/mycelium.rs
@@ -203,7 +203,7 @@ pub async fn fetch_admin_info(rest_url: &Url) -> Result<MyceliumAdminInfo> {
}
#[derive(Debug, Clone)]
-pub struct ClusterNodeConfig {
+pub struct MyceliumNodeConfig {
pub tcp_port: u16,
pub api_port: u16,
pub rpc_port: u16,
@@ -213,7 +213,7 @@ pub struct ClusterNodeConfig {
pub struct SupervisedMycelium {
child: Child,
- pub config: ClusterNodeConfig,
+ pub config: MyceliumNodeConfig,
_key_file_handle: Option<File>,
_net_key_file_handle: Option<File>,
key_file_path: PathBuf,
@@ -251,7 +251,7 @@ impl SupervisedMycelium {
p => p,
};
- let config = ClusterNodeConfig {
+ let config = MyceliumNodeConfig {
tcp_port,
api_port,
rpc_port,
@@ -856,7 +856,7 @@ pub struct HelloRequestShadow {
#[derive(Serialize, Deserialize)]
pub struct HelloReplyShadow<'a> {
// Cow allows zero-copy references when saving, but creates an owned String when loading
- pub cluster_id: Cow<'a, str>,
+ pub swarm_id: Cow<'a, str>,
#[serde(default)]
pub peers: Vec<String>,
#[serde(default)]
@@ -865,7 +865,7 @@ pub struct HelloReplyShadow<'a> {
#[derive(Serialize, Deserialize)]
pub struct SyncEnvelopeShadow<'a> {
- pub cluster_id: Cow<'a, str>,
+ pub swarm_id: Cow<'a, str>,
#[serde(with = "automerge_msg_codec")]
pub message: automerge::sync::Message,
#[serde(default)]
@@ -917,7 +917,7 @@ pub fn bytes_to_hello_request(bytes: &[u8]) -> Result<HelloRequest, TransportErr
// --- HelloReply ---
pub fn hello_reply_to_bytes(msg: &HelloReply) -> Result<Vec<u8>, rmp_serde::encode::Error> {
let shadow = HelloReplyShadow {
- cluster_id: Cow::Borrowed(&msg.cluster_id),
+ swarm_id: Cow::Borrowed(&msg.swarm_id),
peers: msg.peers.clone(), // Vec must be cloned for serialization wrapper matching
epoch: epoch_to_shadow(&msg.epoch),
};
@@ -926,7 +926,7 @@ pub fn hello_reply_to_bytes(msg: &HelloReply) -> Result<Vec<u8>, rmp_serde::enco
pub fn bytes_to_hello_reply(bytes: &[u8]) -> Result<HelloReply, TransportError> {
let shadow: HelloReplyShadow = rmp_serde::from_slice(bytes)?;
Ok(HelloReply {
- cluster_id: shadow.cluster_id.into_owned(),
+ swarm_id: shadow.swarm_id.into_owned(),
peers: shadow.peers,
epoch: epoch_from_shadow(shadow.epoch)?,
})
@@ -935,7 +935,7 @@ pub fn bytes_to_hello_reply(bytes: &[u8]) -> Result<HelloReply, TransportError>
// --- SyncEnvelope ---
pub fn sync_envelope_to_bytes(msg: &SyncEnvelope) -> Result<Vec<u8>, rmp_serde::encode::Error> {
let shadow = SyncEnvelopeShadow {
- cluster_id: Cow::Borrowed(&msg.cluster_id),
+ swarm_id: Cow::Borrowed(&msg.swarm_id),
message: msg.message.clone(), // Clone required by automerge_msg_codec ownership rules
epoch: epoch_to_shadow(&msg.epoch),
};
@@ -944,7 +944,7 @@ pub fn sync_envelope_to_bytes(msg: &SyncEnvelope) -> Result<Vec<u8>, rmp_serde::
pub fn bytes_to_sync_envelope(bytes: &[u8]) -> Result<SyncEnvelope, TransportError> {
let shadow: SyncEnvelopeShadow = rmp_serde::from_slice(bytes)?;
Ok(SyncEnvelope {
- cluster_id: shadow.cluster_id.into_owned(),
+ swarm_id: shadow.swarm_id.into_owned(),
epoch: epoch_from_shadow(shadow.epoch)?,
message: shadow.message,
})