Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Introduce ChainSyncInterface #12489

Merged
paritytech-processbot merged 4 commits into from
Oct 17, 2022
Merged

Introduce ChainSyncInterface #12489

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c994889
Introduce `ChainSyncInterface`
altonen Oct 10, 2022
5890d0c
Apply review comments
altonen Oct 14, 2022
bc5245b
Fix tests
altonen Oct 14, 2022
9bf6e1d
Merge remote-tracking branch 'origin/master' into chainsync-call-dele…
altonen Oct 17, 2022
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
Fix tests
  • Loading branch information
@altonen
altonen committed Oct 14, 2022
commit bc5245bfaa4b6568e03f1370524ca19c76ef5847
12 changes: 6 additions & 6 deletions client/network/src/service/chainsync_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const PROTOCOL_NAME: &str = "/foo";

fn make_network(
chain_sync: Box<dyn ChainSyncT<substrate_test_runtime_client::runtime::Block>>,
chain_sync_service: Arc<dyn ChainSyncInterface<substrate_test_runtime_client::runtime::Block>>,
chain_sync_service: Box<dyn ChainSyncInterface<substrate_test_runtime_client::runtime::Block>>,
client: Arc<substrate_test_runtime_client::TestClient>,
) -> (TestNetworkWorker, Arc<substrate_test_runtime_client::TestClient>) {
let network_config = config::NetworkConfiguration {
Expand Down Expand Up @@ -218,7 +218,7 @@ async fn normal_network_poll_no_peers() {
// build `ChainSyncInterface` provider and set no expecations for it (i.e., it cannot be
// called)
let chain_sync_service =
Arc::new(MockChainSyncInterface::<substrate_test_runtime_client::runtime::Block>::new());
Box::new(MockChainSyncInterface::<substrate_test_runtime_client::runtime::Block>::new());

let (mut network, _) = make_network(chain_sync, chain_sync_service, client);

Expand All @@ -237,7 +237,7 @@ async fn request_justification() {
// build `ChainSyncInterface` provider and set no expecations for it (i.e., it cannot be
// called)
let chain_sync_service =
Arc::new(MockChainSyncInterface::<substrate_test_runtime_client::runtime::Block>::new());
Box::new(MockChainSyncInterface::<substrate_test_runtime_client::runtime::Block>::new());

// build `ChainSync` and verify that call to `request_justification()` is made
let mut chain_sync =
Expand Down Expand Up @@ -272,7 +272,7 @@ async fn clear_justification_requests(&mut self) {
// build `ChainSyncInterface` provider and set no expecations for it (i.e., it cannot be
// called)
let chain_sync_service =
Arc::new(MockChainSyncInterface::<substrate_test_runtime_client::runtime::Block>::new());
Box::new(MockChainSyncInterface::<substrate_test_runtime_client::runtime::Block>::new());

// build `ChainSync` and verify that call to `clear_justification_requests()` is made
let mut chain_sync =
Expand Down Expand Up @@ -320,7 +320,7 @@ async fn set_sync_fork_request() {
.once()
.returning(|_, _, _| ());

let (mut network, _) = make_network(chain_sync, Arc::new(chain_sync_service), client);
let (mut network, _) = make_network(chain_sync, Box::new(chain_sync_service), client);

// send "set sync fork request" message and poll the network
network.service().set_sync_fork_request(copy_peers, hash, number);
Expand All @@ -338,7 +338,7 @@ async fn on_block_finalized() {
// build `ChainSyncInterface` provider and set no expecations for it (i.e., it cannot be
// called)
let chain_sync_service =
Arc::new(MockChainSyncInterface::<substrate_test_runtime_client::runtime::Block>::new());
Box::new(MockChainSyncInterface::<substrate_test_runtime_client::runtime::Block>::new());

// build `ChainSync` and verify that call to `on_block_finalized()` is made
let mut chain_sync =
Expand Down