Skip to content
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.

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

Query missing broadcast messages from peers #428

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Remove saving and querying broadcast messages from network actor
contrun committed Jan 15, 2025
commit 43116ed3c3a9e92e023f2de2c512364a9c8888d5
7 changes: 0 additions & 7 deletions src/fiber/gossip.rs
Original file line number Diff line number Diff line change
@@ -327,8 +327,6 @@ pub enum GossipActorMessage {
Vec<BroadcastMessageQuery>,
RpcReplyPort<Result<QueryBroadcastMessagesResult, GossipError>>,
),
// Save some broadcast messages to the store.
SaveBroadcastMessages(Option<PeerId>, Vec<BroadcastMessage>),
// The querying of broadcast messages from a peer has timed out.
QueryBroadcastMessagesTimeout(PeerId, u64),
// Try to broadcast BroadcastMessage created by us to the network.
@@ -2409,11 +2407,6 @@ where
.try_to_verify_and_save_broadcast_messages(None, vec![message.clone()])
.await;
}
GossipActorMessage::SaveBroadcastMessages(peer_id, vec) => {
state
.try_to_verify_and_save_broadcast_messages(peer_id, vec)
.await;
}
GossipActorMessage::QueryBroadcastMessagesTimeout(peer, request_id) => {
if let Some(reply) = state.query_reply_ports.remove(&(peer, request_id)) {
let _ = reply.send(Err(GossipError::Timeout));
32 changes: 4 additions & 28 deletions src/fiber/network.rs
Original file line number Diff line number Diff line change
@@ -56,14 +56,13 @@ use super::channel::{
};
use super::config::{AnnouncedNodeName, MIN_TLC_EXPIRY_DELTA};
use super::fee::calculate_commitment_tx_fee;
use super::gossip::{GossipActorMessage, GossipError, GossipMessageStore, GossipMessageUpdates};
use super::gossip::{GossipActorMessage, GossipMessageStore, GossipMessageUpdates};
use super::graph::{NetworkGraph, NetworkGraphStateStore, OwnedChannelUpdateEvent, SessionRoute};
use super::key::blake2b_hash_with_salt;
use super::types::{
BroadcastMessage, BroadcastMessageQuery, BroadcastMessageWithTimestamp, EcdsaSignature,
FiberMessage, ForwardTlcResult, GossipMessage, Hash256, NodeAnnouncement, OpenChannel,
PaymentHopData, Privkey, Pubkey, QueryBroadcastMessagesResult, RemoveTlcReason, TlcErr,
TlcErrData, TlcErrorCode,
BroadcastMessage, BroadcastMessageWithTimestamp, EcdsaSignature, FiberMessage,
ForwardTlcResult, GossipMessage, Hash256, NodeAnnouncement, OpenChannel, PaymentHopData,
Privkey, Pubkey, RemoveTlcReason, TlcErr, TlcErrData, TlcErrorCode,
};
use super::{FiberConfig, ASSUME_NETWORK_ACTOR_ALIVE};

@@ -230,15 +229,6 @@ pub enum NetworkActorCommand {
SignTx(PeerId, Hash256, Transaction, Option<Vec<Vec<u8>>>),
// Process a broadcast message from the network.
ProcessBroadcastMessage(BroadcastMessage),
// Save broadcast messages from the network.
SaveBroadcastMessages(Option<PeerId>, Vec<BroadcastMessage>),
// Query broadcast messages from a peer. Some messages may have been missed
// we use this to query them.
QueryBroadcastMessages(
PeerId,
Vec<BroadcastMessageQuery>,
RpcReplyPort<Result<QueryBroadcastMessagesResult, GossipError>>,
),
// Broadcast our BroadcastMessage to the network.
BroadcastMessages(Vec<BroadcastMessageWithTimestamp>),
// Broadcast local information to the network.
@@ -1331,20 +1321,6 @@ where
.send_message(GossipActorMessage::ProcessBroadcastMessage(message))
.expect(ASSUME_GOSSIP_ACTOR_ALIVE);
}
NetworkActorCommand::SaveBroadcastMessages(peer, messages) => {
state
.gossip_actor
.send_message(GossipActorMessage::SaveBroadcastMessages(peer, messages))
.expect(ASSUME_GOSSIP_ACTOR_ALIVE);
}
NetworkActorCommand::QueryBroadcastMessages(peer, queries, reply) => {
state
.gossip_actor
.send_message(GossipActorMessage::QueryBroadcastMessages(
peer, queries, reply,
))
.expect(ASSUME_GOSSIP_ACTOR_ALIVE);
}
NetworkActorCommand::BroadcastMessages(message) => {
state
.gossip_actor