From bbc7abab0a8dbbcf8d9ff1a05b324827eabc5591 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Wed, 10 Nov 2021 14:06:38 +0100 Subject: [PATCH 1/3] req/resp: use IfDisconnected::ImmediateError --- .../availability-distribution/src/pov_requester/mod.rs | 2 +- .../availability-distribution/src/requester/fetch_task/mod.rs | 2 +- .../src/requester/fetch_task/tests.rs | 2 +- node/network/availability-distribution/src/tests/state.rs | 2 +- node/network/availability-recovery/src/lib.rs | 4 ++-- node/network/availability-recovery/src/tests.rs | 4 ++-- node/network/dispute-distribution/src/sender/send_task.rs | 2 +- node/network/dispute-distribution/src/tests/mod.rs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/node/network/availability-distribution/src/pov_requester/mod.rs b/node/network/availability-distribution/src/pov_requester/mod.rs index 1aea7248503f..e55130992eb8 100644 --- a/node/network/availability-distribution/src/pov_requester/mod.rs +++ b/node/network/availability-distribution/src/pov_requester/mod.rs @@ -67,7 +67,7 @@ where // We are supposed to be connected to validators of our group via `PeerSet`, // but at session boundaries that is kind of racy, in case a connection takes // longer to get established, so we try to connect in any case. - IfDisconnected::TryConnect, + IfDisconnected::ImmediateError, )) .await; diff --git a/node/network/availability-distribution/src/requester/fetch_task/mod.rs b/node/network/availability-distribution/src/requester/fetch_task/mod.rs index 93b5d14f8171..3f89239c318f 100644 --- a/node/network/availability-distribution/src/requester/fetch_task/mod.rs +++ b/node/network/availability-distribution/src/requester/fetch_task/mod.rs @@ -327,7 +327,7 @@ impl RunningTask { self.sender .send(FromFetchTask::Message(AllMessages::NetworkBridge( - NetworkBridgeMessage::SendRequests(vec![requests], IfDisconnected::TryConnect), + NetworkBridgeMessage::SendRequests(vec![requests], IfDisconnected::ImmediateError), ))) .await .map_err(|_| TaskError::ShuttingDown)?; diff --git a/node/network/availability-distribution/src/requester/fetch_task/tests.rs b/node/network/availability-distribution/src/requester/fetch_task/tests.rs index e39a9d5ef164..c19c1f720f91 100644 --- a/node/network/availability-distribution/src/requester/fetch_task/tests.rs +++ b/node/network/availability-distribution/src/requester/fetch_task/tests.rs @@ -230,7 +230,7 @@ impl TestRun { match msg { AllMessages::NetworkBridge(NetworkBridgeMessage::SendRequests( reqs, - IfDisconnected::TryConnect, + IfDisconnected::ImmediateError, )) => { let mut valid_responses = 0; for req in reqs { diff --git a/node/network/availability-distribution/src/tests/state.rs b/node/network/availability-distribution/src/tests/state.rs index 77a973473b64..ff94bc659073 100644 --- a/node/network/availability-distribution/src/tests/state.rs +++ b/node/network/availability-distribution/src/tests/state.rs @@ -215,7 +215,7 @@ impl TestState { match msg { AllMessages::NetworkBridge(NetworkBridgeMessage::SendRequests( reqs, - IfDisconnected::TryConnect, + IfDisconnected::ImmediateError, )) => { for req in reqs { // Forward requests: diff --git a/node/network/availability-recovery/src/lib.rs b/node/network/availability-recovery/src/lib.rs index 98785b6d39ea..2f8a8bbd2423 100644 --- a/node/network/availability-recovery/src/lib.rs +++ b/node/network/availability-recovery/src/lib.rs @@ -201,7 +201,7 @@ impl RequestFromBackers { .send_message( NetworkBridgeMessage::SendRequests( vec![Requests::AvailableDataFetching(req)], - IfDisconnected::TryConnect, + IfDisconnected::ImmediateError, ) .into(), ) @@ -345,7 +345,7 @@ impl RequestChunksFromValidators { sender .send_message( - NetworkBridgeMessage::SendRequests(requests, IfDisconnected::TryConnect).into(), + NetworkBridgeMessage::SendRequests(requests, IfDisconnected::ImmediateError).into(), ) .await; } diff --git a/node/network/availability-recovery/src/tests.rs b/node/network/availability-recovery/src/tests.rs index 190507ae4d0e..9b545f8fbc6d 100644 --- a/node/network/availability-recovery/src/tests.rs +++ b/node/network/availability-recovery/src/tests.rs @@ -275,7 +275,7 @@ impl TestState { AllMessages::NetworkBridge( NetworkBridgeMessage::SendRequests( requests, - IfDisconnected::TryConnect, + IfDisconnected::ImmediateError, ) ) => { for req in requests { @@ -324,7 +324,7 @@ impl TestState { AllMessages::NetworkBridge( NetworkBridgeMessage::SendRequests( mut requests, - IfDisconnected::TryConnect, + IfDisconnected::ImmediateError, ) ) => { assert_eq!(requests.len(), 1); diff --git a/node/network/dispute-distribution/src/sender/send_task.rs b/node/network/dispute-distribution/src/sender/send_task.rs index 6b7958b06281..3e99a7e21f79 100644 --- a/node/network/dispute-distribution/src/sender/send_task.rs +++ b/node/network/dispute-distribution/src/sender/send_task.rs @@ -307,7 +307,7 @@ async fn send_requests( let msg = NetworkBridgeMessage::SendRequests( reqs, // We should be connected, but the hell - if not, try! - IfDisconnected::TryConnect, + IfDisconnected::ImmediateError, ); ctx.send_message(AllMessages::NetworkBridge(msg)).await; Ok(statuses) diff --git a/node/network/dispute-distribution/src/tests/mod.rs b/node/network/dispute-distribution/src/tests/mod.rs index 3a8c742f7ef4..9bec01290682 100644 --- a/node/network/dispute-distribution/src/tests/mod.rs +++ b/node/network/dispute-distribution/src/tests/mod.rs @@ -663,7 +663,7 @@ async fn check_sent_requests( assert_matches!( handle.recv().await, AllMessages::NetworkBridge( - NetworkBridgeMessage::SendRequests(reqs, IfDisconnected::TryConnect) + NetworkBridgeMessage::SendRequests(reqs, IfDisconnected::ImmediateError) ) => { let reqs: Vec<_> = reqs.into_iter().map(|r| assert_matches!( From 9dcca6cc39d2f0cd9f4c2e4d7cdd99ab2d0c8203 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Wed, 10 Nov 2021 14:59:55 +0100 Subject: [PATCH 2/3] remove outdated comments --- .../network/availability-distribution/src/pov_requester/mod.rs | 3 --- node/network/dispute-distribution/src/sender/send_task.rs | 1 - 2 files changed, 4 deletions(-) diff --git a/node/network/availability-distribution/src/pov_requester/mod.rs b/node/network/availability-distribution/src/pov_requester/mod.rs index e55130992eb8..ea639ed1c394 100644 --- a/node/network/availability-distribution/src/pov_requester/mod.rs +++ b/node/network/availability-distribution/src/pov_requester/mod.rs @@ -64,9 +64,6 @@ where ctx.send_message(NetworkBridgeMessage::SendRequests( vec![full_req], - // We are supposed to be connected to validators of our group via `PeerSet`, - // but at session boundaries that is kind of racy, in case a connection takes - // longer to get established, so we try to connect in any case. IfDisconnected::ImmediateError, )) .await; diff --git a/node/network/dispute-distribution/src/sender/send_task.rs b/node/network/dispute-distribution/src/sender/send_task.rs index 3e99a7e21f79..a9b784762554 100644 --- a/node/network/dispute-distribution/src/sender/send_task.rs +++ b/node/network/dispute-distribution/src/sender/send_task.rs @@ -306,7 +306,6 @@ async fn send_requests( let msg = NetworkBridgeMessage::SendRequests( reqs, - // We should be connected, but the hell - if not, try! IfDisconnected::ImmediateError, ); ctx.send_message(AllMessages::NetworkBridge(msg)).await; From 129ae035ed6bddc079cfecb632e0bf4afb5692cd Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Wed, 10 Nov 2021 15:12:46 +0100 Subject: [PATCH 3/3] fmt --- node/network/dispute-distribution/src/sender/send_task.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/node/network/dispute-distribution/src/sender/send_task.rs b/node/network/dispute-distribution/src/sender/send_task.rs index a9b784762554..b75ea8d6a1c3 100644 --- a/node/network/dispute-distribution/src/sender/send_task.rs +++ b/node/network/dispute-distribution/src/sender/send_task.rs @@ -304,10 +304,7 @@ async fn send_requests( statuses.insert(receiver, DeliveryStatus::Pending(remote_handle)); } - let msg = NetworkBridgeMessage::SendRequests( - reqs, - IfDisconnected::ImmediateError, - ); + let msg = NetworkBridgeMessage::SendRequests(reqs, IfDisconnected::ImmediateError); ctx.send_message(AllMessages::NetworkBridge(msg)).await; Ok(statuses) }