Merge branch 'master' into dev-chain

This commit is contained in:
keorn
2016-11-14 10:05:34 +00:00
30 changed files with 292 additions and 120 deletions

View File

@@ -168,7 +168,7 @@ impl Spec {
/// Get the configured Network ID.
pub fn network_id(&self) -> usize { self.params.network_id }
/// Get the configured Network ID.
/// Get the configured subprotocol name.
pub fn subprotocol_name(&self) -> String { self.params.subprotocol_name.clone() }
/// Get the configured network fork block.