Skip to content

Send onion messages #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orbitalturtle wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Send onion messages #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27c0214
Switch stop signal over to `tokio::sync::watch::channel`
tnull May 17, 2023
5a6b42d
Regularly broadcast node announcement
tnull May 11, 2023
3105d12
Persist latest_node_ann_broadcast_timestamp
tnull May 18, 2023
b577cc4
Expose onion messenger on Node struct
orbitalturtle Jun 12, 2023
7157482
Add Node fn for sending an onion message
orbitalturtle Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/io/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@ pub(crate) const PEER_INFO_PERSISTENCE_KEY: &str = "peers";
pub(crate) const PAYMENT_INFO_PERSISTENCE_NAMESPACE: &str = "payments";

/// RapidGossipSync's `latest_sync_timestamp` will be persisted under this key.
pub(crate) const RGS_LATEST_SYNC_TIMESTAMP_NAMESPACE: &str = "";
pub(crate) const RGS_LATEST_SYNC_TIMESTAMP_KEY: &str = "rgs_latest_sync_timestamp";
pub(crate) const LATEST_RGS_SYNC_TIMESTAMP_NAMESPACE: &str = "";
pub(crate) const LATEST_RGS_SYNC_TIMESTAMP_KEY: &str = "latest_rgs_sync_timestamp";

/// The last time we broadcast a node announcement will be persisted under this key.
pub(crate) const LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE: &str = "";
pub(crate) const LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY: &str = "latest_node_ann_bcast_timestamp";

/// Provides an interface that allows to store and retrieve persisted values that are associated
/// with given keys.
Expand Down
77 changes: 67 additions & 10 deletions src/io/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,12 @@ where
Ok(res)
}

pub(crate) fn read_rgs_latest_sync_timestamp<K: Deref>(kv_store: K) -> Result<u32, std::io::Error>
pub(crate) fn read_latest_rgs_sync_timestamp<K: Deref>(kv_store: K) -> Result<u32, std::io::Error>
where
K::Target: KVStore,
{
let mut reader =
kv_store.read(RGS_LATEST_SYNC_TIMESTAMP_NAMESPACE, RGS_LATEST_SYNC_TIMESTAMP_KEY)?;
kv_store.read(LATEST_RGS_SYNC_TIMESTAMP_NAMESPACE, LATEST_RGS_SYNC_TIMESTAMP_KEY)?;
u32::read(&mut reader).map_err(|_| {
std::io::Error::new(
std::io::ErrorKind::InvalidData,
Expand All @@ -188,21 +188,21 @@ where
})
}

pub(crate) fn write_rgs_latest_sync_timestamp<K: Deref, L: Deref>(
pub(crate) fn write_latest_rgs_sync_timestamp<K: Deref, L: Deref>(
updated_timestamp: u32, kv_store: K, logger: L,
) -> Result<(), Error>
where
K::Target: KVStore,
L::Target: Logger,
{
let mut writer = kv_store
.write(RGS_LATEST_SYNC_TIMESTAMP_NAMESPACE, RGS_LATEST_SYNC_TIMESTAMP_KEY)
.write(LATEST_RGS_SYNC_TIMESTAMP_NAMESPACE, LATEST_RGS_SYNC_TIMESTAMP_KEY)
.map_err(|e| {
log_error!(
logger,
"Getting writer for key {}/{} failed due to: {}",
RGS_LATEST_SYNC_TIMESTAMP_NAMESPACE,
RGS_LATEST_SYNC_TIMESTAMP_KEY,
LATEST_RGS_SYNC_TIMESTAMP_NAMESPACE,
LATEST_RGS_SYNC_TIMESTAMP_KEY,
e
);
Error::PersistenceFailed
Expand All @@ -211,8 +211,8 @@ where
log_error!(
logger,
"Writing data to key {}/{} failed due to: {}",
RGS_LATEST_SYNC_TIMESTAMP_NAMESPACE,
RGS_LATEST_SYNC_TIMESTAMP_KEY,
LATEST_RGS_SYNC_TIMESTAMP_NAMESPACE,
LATEST_RGS_SYNC_TIMESTAMP_KEY,
e
);
Error::PersistenceFailed
Expand All @@ -221,8 +221,65 @@ where
log_error!(
logger,
"Committing data to key {}/{} failed due to: {}",
RGS_LATEST_SYNC_TIMESTAMP_NAMESPACE,
RGS_LATEST_SYNC_TIMESTAMP_KEY,
LATEST_RGS_SYNC_TIMESTAMP_NAMESPACE,
LATEST_RGS_SYNC_TIMESTAMP_KEY,
e
);
Error::PersistenceFailed
})
}

pub(crate) fn read_latest_node_ann_bcast_timestamp<K: Deref>(
kv_store: K,
) -> Result<u64, std::io::Error>
where
K::Target: KVStore,
{
let mut reader = kv_store
.read(LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE, LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY)?;
u64::read(&mut reader).map_err(|_| {
std::io::Error::new(
std::io::ErrorKind::InvalidData,
"Failed to deserialize latest node announcment broadcast timestamp",
)
})
}

pub(crate) fn write_latest_node_ann_bcast_timestamp<K: Deref, L: Deref>(
updated_timestamp: u64, kv_store: K, logger: L,
) -> Result<(), Error>
where
K::Target: KVStore,
L::Target: Logger,
{
let mut writer = kv_store
.write(LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE, LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY)
.map_err(|e| {
log_error!(
logger,
"Getting writer for key {}/{} failed due to: {}",
LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE,
LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY,
e
);
Error::PersistenceFailed
})?;
updated_timestamp.write(&mut writer).map_err(|e| {
log_error!(
logger,
"Writing data to key {}/{} failed due to: {}",
LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE,
LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY,
e
);
Error::PersistenceFailed
})?;
writer.commit().map_err(|e| {
log_error!(
logger,
"Committing data to key {}/{} failed due to: {}",
LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE,
LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY,
e
);
Error::PersistenceFailed
Expand Down
Loading