Further adapt to libp2p/master.

Author: Roman S. Borschel

Cargo.toml

@@ -176,6 +176,7 @@ panic = "unwind"
 
 [patch.crates-io]
 # libp2p = { path = "../rust-libp2p" }
-libp2p = { git = "https://github.com/romanb/rust-libp2p", branch = "multicon" }
+libp2p = { git = "https://github.com/libp2p/rust-libp2p", branch = "master" }
+libp2p-wasm-ext = { git = "https://github.com/libp2p/rust-libp2p", branch = "master" }
 
 

client/authority-discovery/src/lib.rs

@@ -312,7 +312,7 @@ where
 				.map_err(Error::EncodingProto)?;
 
 			self.network.put_value(
-				hash_authority_id(key.1.as_ref())?,
+				hash_authority_id(key.1.as_ref()),
 				signed_addresses,
 			);
 		}
@@ -335,7 +335,7 @@ where
 
 		for authority_id in authorities.iter() {
 			self.network
-				.get_value(&hash_authority_id(authority_id.as_ref())?);
+				.get_value(&hash_authority_id(authority_id.as_ref()));
 		}
 
 		Ok(())
@@ -420,8 +420,8 @@ where
 			self.addr_cache.retain_ids(&authorities);
 			authorities
 				.into_iter()
-				.map(|id| hash_authority_id(id.as_ref()).map(|h| (h, id)))
-				.collect::<Result<HashMap<_, _>>>()?
+				.map(|id| (hash_authority_id(id.as_ref()), id))
+				.collect::<HashMap<_, _>>()
 		};
 
 		// Check if the event origins from an authority in the current authority set.
@@ -598,10 +598,8 @@ where
 	}
 }
 
-fn hash_authority_id(id: &[u8]) -> Result<libp2p::kad::record::Key> {
-	libp2p::multihash::encode(libp2p::multihash::Hash::SHA2256, id)
-		.map(|k| libp2p::kad::record::Key::new(&k))
-		.map_err(Error::HashingAuthorityId)
+fn hash_authority_id(id: &[u8]) -> libp2p::kad::record::Key {
+	libp2p::kad::record::Key::new(&libp2p::multihash::Sha2_256::digest(id))
 }
 
 fn interval_at(start: Instant, duration: Duration) -> Interval {

client/authority-discovery/src/tests.rs

@@ -303,7 +303,7 @@ fn handle_dht_events_with_value_found_should_call_set_priority_group() {
 
 	// Create sample dht event.
 
-	let authority_id_1 = hash_authority_id(key_pair.public().as_ref()).unwrap();
+	let authority_id_1 = hash_authority_id(key_pair.public().as_ref());
 	let address_1: Multiaddr = "/ip6/2001:db8::".parse().unwrap();
 
 	let mut serialized_addresses = vec![];

client/network-gossip/Cargo.toml

@@ -13,7 +13,7 @@ documentation = "https://docs.rs/sc-network-gossip"
 [dependencies]
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.16.2", default-features = false, features = ["libp2p-websocket"] }
+libp2p = { version = "0.16.2", default-features = false, features = ["websocket"] }
 log = "0.4.8"
 lru = "0.4.3"
 sc-network = { version = "0.8.0-alpha.5", path = "../network" }

client/network/Cargo.toml

@@ -26,7 +26,6 @@ futures = "0.3.4"
 futures_codec = "0.3.3"
 futures-timer = "3.0.1"
 wasm-timer = "0.2"
-libp2p = { version = "0.16.2", default-features = false, features = ["libp2p-websocket"] }
 linked-hash-map = "0.5.2"
 linked_hash_set = "0.1.3"
 log = "0.4.8"
@@ -58,10 +57,16 @@ unsigned-varint = { version = "0.3.1", features = ["futures", "futures-codec"] }
 void = "1.0.2"
 zeroize = "1.0.0"
 
+[dependencies.libp2p]
+version = "0.16.2"
+default-features = false
+features = ["websocket", "kad", "mdns", "ping", "identify", "mplex", "yamux", "noise"]
+
 [dev-dependencies]
 async-std = "1.5"
 assert_matches = "1.3"
 env_logger = "0.7.0"
+libp2p = { version = "0.16.2", default-features = false, features = ["secio"] }
 quickcheck = "0.9.0"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0-alpha.5", path = "../../primitives/keyring" }

client/telemetry/Cargo.toml

@@ -16,7 +16,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.0"
-libp2p = { version = "0.16.2", default-features = false, features = ["libp2p-websocket"] }
+libp2p = { version = "0.16.2", default-features = false, features = ["websocket", "wasm-ext", "tcp", "dns"] }
 log = "0.4.8"
 pin-project = "0.4.6"
 rand = "0.7.2"