Batch P2P Messages #1149
Merged
Batch P2P Messages #1149
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79de04c to
eafd32e
Compare
kylezs
reviewed
Jan 11, 2022
|
|
||
| let (own_message, outgoing_messages) = match self.processor.init() { | ||
| DataToSend::Broadcast(stage_data) => { | ||
| let ceremony_data: D = stage_data.clone().into(); |
There was a problem hiding this comment.
Suggested change
| let ceremony_data: D = stage_data.clone().into(); | |
| let ceremony_data: Self::Message = stage_data.clone().into(); |
Same below
msgmaxim
approved these changes
Jan 12, 2022
engine/src/multisig_p2p.rs
Outdated
| Ok(_) => slog::info!(logger, "Sent P2P message to: {}", account_id), | ||
| Err(error) => slog::error!(logger, "Failed to send P2P message to: {}. {}", account_id, error) | ||
| Some(messages) = outgoing_p2p_message_receiver.recv() => { | ||
| async fn send_messages<'a, AccountIds: 'a + IntoIterator<Item = &'a AccountId> + Clone>(client: &P2PRpcClient, account_to_peer: &BTreeMap<AccountId, (PeerId, u16, Ipv6Addr)>, account_ids: AccountIds, message: MultisigMessage, logger: &slog::Logger) { |
There was a problem hiding this comment.
Can we reconsider the practice of defining named functions (lambdas are a different story) inside other functions? It reduces readability in my opinion, and doesn't add any real benefit (e.g. I can't see at glance what this loop does, but with send_messages taken out the entire loop fits entirely in one screen). Like, you don't reduce the scope of this function by that much as long as it is private.
The formatting is also much nicer when the function is taken out:
async fn send_messages<'a, AccountIds: 'a + IntoIterator<Item = &'a AccountId> + Clone>(
client: &P2PRpcClient,
account_to_peer: &BTreeMap<AccountId, (PeerId, u16, Ipv6Addr)>,
account_ids: AccountIds,
message: MultisigMessage,
logger: &slog::Logger,
) {
j4m1ef0rd
approved these changes
Jan 12, 2022
9b54117 to
856e5bc
Compare
eafd32e to
c7f2742
Compare
Base automatically changed from
chore/oneshot-remove-keygen-state-runner
to
develop
January 12, 2022 08:01
f5660b9 to
0058f82
Compare
kylezs
approved these changes
Jan 12, 2022
|
Merging as we got three approvals. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will batch the p2p messages decreasing the RPC bandwidth for broadcast multisig stages (By not sending the same message repeatedly via RPC).
I also did this now to simplify the existing multisig tests to help abit when refactoring them for the oneshot.
I've chosen to not change the SC's p2p rpc interface here because we are likely to remove all the p2p code in the SC and handle peering manually in the CFE.
Note I did remove this log message from the tests (println!("recv secret3 keygen, i: {}", i);), and added assert_channel_empty in all cases after receiving p2p messages via the channel in the tests. Otherwise behaviour is the same.