separate semantic_version from util (#6438)

openethereum · Sep 2, 2017 · 2faa28c · 2faa28c
1 parent 0b5285c
commit 2faa28c
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -62,6 +62,7 @@ bloomable = { path = "../util/bloomable" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
 hash = { path = "../util/hash" }
+semantic_version = { path = "../util/semantic_version" }
 
 [dev-dependencies]
 native-contracts = { path = "native_contracts", features = ["test_contracts"] }

diff --git a/ethcore/src/engines/authority_round/mod.rs b/ethcore/src/engines/authority_round/mod.rs
@@ -42,6 +42,7 @@ use ethkey::{verify_address, Signature};
 use io::{IoContext, IoHandler, TimerToken, IoService};
 use itertools::{self, Itertools};
 use rlp::{UntrustedRlp, encode};
+use semantic_version::SemanticVersion;
 use util::*;
 
 mod finality;

diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
@@ -31,6 +31,7 @@ use evm::Schedule;
 use ethjson;
 use header::{Header, BlockNumber};
 use client::Client;
+use semantic_version::SemanticVersion;
 use super::signer::EngineSigner;
 use super::validator_set::{ValidatorSet, SimpleList, new_validator_set};
 

diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
@@ -54,6 +54,7 @@ use spec::CommonParams;
 use transaction::{UnverifiedTransaction, SignedTransaction};
 
 use ethkey::Signature;
+use semantic_version::SemanticVersion;
 use util::*;
 
 /// Default EIP-210 contrat code.

diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs
@@ -48,6 +48,7 @@ use super::transition::TransitionHandler;
 use super::vote_collector::VoteCollector;
 use self::message::*;
 use self::params::TendermintParams;
+use semantic_version::SemanticVersion;
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
 pub enum Step {

diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
@@ -35,6 +35,7 @@ use evm::Schedule;
 use ethjson;
 use rlp::{self, UntrustedRlp};
 use vm::LastHashes;
+use semantic_version::SemanticVersion;
 
 /// Parity tries to round block.gas_limit to multiple of this constant
 pub const PARITY_GAS_LIMIT_DETERMINANT: U256 = U256([37, 0, 0, 0]);

diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
@@ -104,6 +104,7 @@ extern crate rlp;
 extern crate hash;
 extern crate heapsize;
 extern crate ansi_term;
+extern crate semantic_version;
 
 #[macro_use]
 extern crate rlp_derive;

diff --git a/util/semantic_version/Cargo.toml b/util/semantic_version/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "semantic_version"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
diff --git a/util/src/semantic_version.rs → util/semantic_version/src/lib.rs b/util/src/semantic_version.rs → util/semantic_version/src/lib.rs
@@ -20,8 +20,8 @@
 ///
 /// # Example
 /// ```
-/// extern crate ethcore_util as util;
-/// use util::semantic_version::*;
+/// extern crate semantic_version;
+/// use semantic_version::*;
 ///
 /// fn main() {
 ///   assert_eq!(SemanticVersion::new(1, 2, 3).as_u32(), 0x010203);

diff --git a/util/src/lib.rs b/util/src/lib.rs
@@ -128,7 +128,6 @@ pub mod triehash;
 pub mod trie;
 pub mod nibbleslice;
 pub mod nibblevec;
-pub mod semantic_version;
 pub mod snappy;
 pub mod cache;
 
@@ -139,7 +138,6 @@ pub use overlaydb::*;
 pub use journaldb::JournalDB;
 pub use triehash::*;
 pub use trie::{Trie, TrieMut, TrieDB, TrieDBMut, TrieFactory, TrieError, SecTrieDB, SecTrieDBMut};
-pub use semantic_version::*;
 pub use kvdb::*;
 pub use error::*;
 pub use bytes::*;