Bump Substrate & versions (#747)

* Bump versions

* Update for tipping treasury

* Bump substrate

* Fixes

* Put send_consensus back in.

* Fix test

* Fixes

* Fixes

* Fix warning

polkadot/network/src/collator_pool.rs

@@ -23,7 +23,8 @@ use sc_network::PeerId;
 use futures::channel::oneshot;
 
 use std::collections::hash_map::{HashMap, Entry};
-use std::time::{Duration, Instant};
+use std::time::Duration;
+use wasm_timer::Instant;
 
 const COLLATION_LIFETIME: Duration = Duration::from_secs(60 * 5);
 

polkadot/network/src/local_collations.rs

@@ -22,7 +22,8 @@
 use polkadot_primitives::{Hash, parachain::{ValidatorId}};
 use crate::collator_pool::Role;
 use std::collections::{HashMap, HashSet};
-use std::time::{Duration, Instant};
+use std::time::Duration;
+use wasm_timer::Instant;
 
 const LIVE_FOR: Duration = Duration::from_secs(60 * 5);
 

polkadot/network/src/tests/mod.rs

@@ -47,8 +47,8 @@ struct TestContext {
 
 impl Context<Block> for TestContext {
 	fn report_peer(&mut self, peer: PeerId, reputation: ReputationChange) {
-        let reputation = self.reputations.get(&peer).map_or(reputation.value, |v| v + reputation.value);
-        self.reputations.insert(peer.clone(), reputation);
+		let reputation = self.reputations.get(&peer).map_or(reputation.value, |v| v + reputation.value);
+		self.reputations.insert(peer.clone(), reputation);
 
 		match reputation {
 			i if i < -100 => self.disabled.push(peer),
@@ -57,6 +57,10 @@ impl Context<Block> for TestContext {
 		}
 	}
 
+	fn send_consensus(&mut self, _who: PeerId, _consensus: Vec<ConsensusMessage>) {
+		unimplemented!()
+	}
+
 	fn send_chain_specific(&mut self, who: PeerId, message: Vec<u8>) {
 		self.messages.push((who, message))
 	}