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

Simplify trait bounds in network to prepare for collator-rpc #12082

Merged
merged 37 commits into from
Aug 31, 2022
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ceb706e
Hack towards PoC
skunert Mar 15, 2022
b2e5b5d
Abstract away runtime requirement
skunert Mar 15, 2022
97264ff
blockchainevents
skunert Mar 24, 2022
21ead6f
Remove bitswap
skunert Apr 5, 2022
bacd2b4
Merge branch 'master' into collator-rpc-poc
Apr 8, 2022
e74cc52
Remove unused sync more
skunert Apr 25, 2022
22ec4b9
Merge branch 'cumulus-2022-04-25' into collator-rpc-poc
skunert Apr 25, 2022
5ef24b8
Merge branch 'cumulus-2022-05-11' into collator-rpc-poc
skunert May 11, 2022
b0a149e
Remove unused features in network
skunert May 27, 2022
a1b1244
Re-enable bitswap change
skunert May 27, 2022
ebd73bd
Merge branch 'cumulus-2022-05-30' into collator-rpc-poc
skunert May 30, 2022
a2f2c60
Remove `Chain` trait bound
skunert Jun 1, 2022
44da032
Reimplement blockchain-rpc-events
skunert Jun 20, 2022
acf4446
Merge branch 'cumulus-2022-06-20' into collator-rpc-poc
skunert Jun 20, 2022
63581d0
Move network to cumulus
skunert Jun 22, 2022
ab192df
Make AuthorityDiscovery async
skunert Jun 23, 2022
9aae7e0
Merge branch 'cumulus-2022-07-11' into collator-rpc-poc
skunert Jul 11, 2022
f52fa93
Merge branch 'cumulus-2022-07-26' into collator-rpc-poc
skunert Jul 26, 2022
8b7820a
Merge branch 'cumulus-2022-08-03' into collator-rpc-poc
skunert Aug 3, 2022
9782ad4
Remove `ProofProvider` requirement from network behaviour
skunert Aug 5, 2022
f02bd87
Extract bitswap
skunert Aug 8, 2022
1ee5965
Merge branch 'cumulus-2022-08-11' into collator-rpc-poc
skunert Aug 11, 2022
6e0645c
Adjustments after merge
skunert Aug 11, 2022
ddc8ef9
Remove HeaderMetadata trait from network
skunert Aug 17, 2022
054c327
Introduce NetworkHeaderBackend
skunert Aug 18, 2022
a7213c2
Add comments
skunert Aug 19, 2022
e040f2f
Merge commit 'b7d2cb5c2dbfbc49cb3c06f6198daa60b04f16c0' into collator…
skunert Aug 22, 2022
7165e1a
Improve comments
skunert Aug 22, 2022
25067f6
Move NetworkHeaderBackend to new module
skunert Aug 22, 2022
073e40f
Improve naming, remove redundand send + sync
skunert Aug 22, 2022
a240068
Clean up generics
skunert Aug 22, 2022
25578ec
Fix CI
skunert Aug 23, 2022
f3663f3
Merge branch 'master' into collator-rpc-poc
skunert Aug 24, 2022
0459dd1
Improve comment and readability
skunert Aug 25, 2022
f0f56ec
Remove NetworkHeaderBackend
skunert Aug 26, 2022
0659230
Merge branch 'master' into collator-rpc-poc
skunert Aug 29, 2022
b4b49a6
Fix Cargo.lock
skunert Aug 29, 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
Remove bitswap
  • Loading branch information
skunert committed Apr 5, 2022
commit 21ead6f60bf5a2886156598825e3004911e98cf1
6 changes: 3 additions & 3 deletions client/network/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
let is_major_syncing = Arc::new(AtomicBool::new(false));

// Build the swarm.
let client = params.chain.clone();
// let client = params.chain.clone();
let (mut swarm, bandwidth): (Swarm<B>, _) = {
let user_agent = format!(
"{} ({})",
Expand Down Expand Up @@ -337,7 +337,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
};

let behaviour = {
let bitswap = params.network_config.ipfs_server.then(|| Bitswap::new(client));
// let bitswap = params.network_config.ipfs_server.then(|| Bitswap::new(client));
let result = Behaviour::new(
protocol,
user_agent,
Expand All @@ -346,7 +346,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
params.block_request_protocol_config,
params.state_request_protocol_config,
warp_sync_protocol_config,
bitswap,
None,
params.light_client_request_protocol_config,
params.network_config.request_response_protocols,
peerset_handle.clone(),
Expand Down