mirror of
https://github.com/jmcorgan/fips.git
synced 2026-07-30 19:46:15 +00:00
Merge branch 'refactor-node' into refactor-node-next
# Conflicts: # src/node/dataplane/peer_actions.rs
This commit is contained in:
@@ -102,7 +102,6 @@ impl Node {
|
||||
/// `index_allocator` are **distinct `Node` fields**, so the collect below is a
|
||||
/// disjoint two-field borrow the checker accepts; once the actions are
|
||||
/// collected both borrows drop and the executor runs against `&mut self`.
|
||||
#[allow(dead_code)]
|
||||
pub(in crate::node) async fn advance_peer_machine(
|
||||
&mut self,
|
||||
link: LinkId,
|
||||
@@ -125,7 +124,6 @@ impl Node {
|
||||
/// executor stays a single flat future (no boxing) and the emitted order is
|
||||
/// preserved. `PromoteToActive` (deferred) will feed its resolution back into
|
||||
/// the machine and fold follow-up actions onto this same queue.
|
||||
#[allow(dead_code)]
|
||||
pub(in crate::node) async fn execute_peer_actions(
|
||||
&mut self,
|
||||
link: LinkId,
|
||||
|
||||
@@ -113,7 +113,7 @@ impl Node {
|
||||
self.advance_peer_machine(
|
||||
link,
|
||||
PeerEvent::RekeyConsume { action },
|
||||
Self::now_ms(),
|
||||
ambient.now_ms,
|
||||
&ambient,
|
||||
)
|
||||
.await;
|
||||
|
||||
Reference in New Issue
Block a user