Remove bitswap per https:/github.com/libp2p/rust-libp2p/issues/2632

Notably libp2p/rust-libp2p#2632 (comment) and libp2p/rust-libp2p#2632 (comment).
serai-dex · Nov 21, 2023 · 043eacc · 043eacc
1 parent 1626c20
commit 043eacc
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 749 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,7 +48,6 @@ members = [
 	"substrate/client/mixnet",
 	"substrate/client/network-gossip",
 	"substrate/client/network",
-	"substrate/client/network/bitswap",
 	"substrate/client/network/common",
 	"substrate/client/network/light",
 	"substrate/client/network/sync",

diff --git a/removed_folders.txt b/removed_folders.txt
@@ -13,6 +13,7 @@
 ./substrate/client/consensus/merkle-mountain-range
 ./substrate/client/consensus/pow
 ./substrate/client/merkle-mountain-range
+./substrate/client/network/bitswap
 ./substrate/client/network/statement
 ./substrate/client/rpc/src/statement
 ./substrate/client/rpc-api/src/statement

diff --git a/substrate/client/cli/src/params/network_params.rs b/substrate/client/cli/src/params/network_params.rs
@@ -129,10 +129,6 @@ pub struct NetworkParams {
 	#[arg(long, default_value = "20")]
 	pub kademlia_replication_factor: NonZeroUsize,
 
-	/// Join the IPFS network and serve transactions over bitswap protocol.
-	#[arg(long)]
-	pub ipfs_server: bool,
-
 	/// Blockchain syncing mode.
 	#[arg(
 		long,
@@ -243,7 +239,6 @@ impl NetworkParams {
 			kademlia_disjoint_query_paths: self.kademlia_disjoint_query_paths,
 			kademlia_replication_factor: self.kademlia_replication_factor,
 			yamux_window_size: None,
-			ipfs_server: self.ipfs_server,
 			sync_mode: self.sync.into(),
 		}
 	}

diff --git a/substrate/client/network/bitswap/Cargo.toml b/substrate/client/network/bitswap/Cargo.toml
diff --git a/substrate/client/network/bitswap/build.rs b/substrate/client/network/bitswap/build.rs