Updates for CC's recent upgrade (#1381)

* Updates for CC's recent upgrade

- Version bump to 0.9.2
- Runtime version bump to v14
- Avoid misuse of error return type for system_health RPC

* Fix tests
This commit is contained in:
Gav Wood
2019-01-10 11:34:25 +01:00
committed by GitHub
parent ecbb51f729
commit 37fa74b891
7 changed files with 21 additions and 25 deletions
+5 -15
View File
@@ -103,21 +103,11 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
fn system_health(&self) -> Result<Health> {
let status = self.sync.status();
let is_syncing = status.sync.is_major_syncing();
let peers = status.num_peers;
let health = Health {
peers,
is_syncing,
};
let has_no_peers = peers == 0 && self.should_have_peers;
if has_no_peers || is_syncing {
Err(error::ErrorKind::NotHealthy(health))?
} else {
Ok(health)
}
Ok(Health {
peers: status.num_peers,
is_syncing: status.sync.is_major_syncing(),
should_have_peers: self.should_have_peers,
})
}
fn system_peers(&self) -> Result<Vec<PeerInfo<B::Hash, <B::Header as HeaderT>::Number>>> {