From 856c348e3eb39879761207bae2412e8b56cdacd2 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Wed, 27 Jan 2016 17:14:41 +0100
Subject: [PATCH] moved old rpc implementation to v1/ dir

---
 bin/src/main.rs                 |  2 +-
 rpc/src/lib.rs                  |  7 +------
 rpc/src/{ => v1}/impls/eth.rs   |  4 ++--
 rpc/src/{ => v1}/impls/mod.rs   |  0
 rpc/src/{ => v1}/impls/net.rs   |  2 +-
 rpc/src/{ => v1}/impls/web3.rs  |  2 +-
 rpc/src/v1/mod.rs               | 10 ++++++++++
 rpc/src/{ => v1}/traits/eth.rs  |  0
 rpc/src/{ => v1}/traits/mod.rs  |  0
 rpc/src/{ => v1}/traits/net.rs  |  0
 rpc/src/{ => v1}/traits/web3.rs |  0
 rpc/src/{ => v1}/types/block.rs |  0
 rpc/src/{ => v1}/types/mod.rs   |  0
 13 files changed, 16 insertions(+), 11 deletions(-)
 rename rpc/src/{ => v1}/impls/eth.rs (98%)
 rename rpc/src/{ => v1}/impls/mod.rs (100%)
 rename rpc/src/{ => v1}/impls/net.rs (94%)
 rename rpc/src/{ => v1}/impls/web3.rs (95%)
 create mode 100644 rpc/src/v1/mod.rs
 rename rpc/src/{ => v1}/traits/eth.rs (100%)
 rename rpc/src/{ => v1}/traits/mod.rs (100%)
 rename rpc/src/{ => v1}/traits/net.rs (100%)
 rename rpc/src/{ => v1}/traits/web3.rs (100%)
 rename rpc/src/{ => v1}/types/block.rs (100%)
 rename rpc/src/{ => v1}/types/mod.rs (100%)

diff --git a/bin/src/main.rs b/bin/src/main.rs
index 402a0c7c1..712635652 100644
--- a/bin/src/main.rs
+++ b/bin/src/main.rs
@@ -50,7 +50,7 @@ fn setup_log(init: &String) {
 
 #[cfg(feature = "rpc")]
 fn setup_rpc_server(client: Arc<Client>) {
-	use rpc::*;
+	use rpc::v1::*;
 	
 	let mut server = HttpServer::new(1);
 	server.add_delegate(Web3Client::new().to_delegate());
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 816eeb4a4..7bc1d6987 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -17,12 +17,7 @@ macro_rules! rpcerr {
 	() => (Err(Error::internal_error()))
 }
 
-pub mod traits;
-mod impls;
-mod types;
-
-pub use self::traits::{Web3, Eth, EthFilter, Net};
-pub use self::impls::*;
+pub mod v1;
 
 /// Http server.
 pub struct HttpServer {
diff --git a/rpc/src/impls/eth.rs b/rpc/src/v1/impls/eth.rs
similarity index 98%
rename from rpc/src/impls/eth.rs
rename to rpc/src/v1/impls/eth.rs
index 91c05541a..46718601b 100644
--- a/rpc/src/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -6,8 +6,8 @@ use util::uint::*;
 use util::sha3::*;
 use ethcore::client::*;
 use ethcore::views::*;
-use traits::{Eth, EthFilter};
-use types::Block;
+use v1::traits::{Eth, EthFilter};
+use v1::types::Block;
 
 /// Eth rpc implementation.
 pub struct EthClient {
diff --git a/rpc/src/impls/mod.rs b/rpc/src/v1/impls/mod.rs
similarity index 100%
rename from rpc/src/impls/mod.rs
rename to rpc/src/v1/impls/mod.rs
diff --git a/rpc/src/impls/net.rs b/rpc/src/v1/impls/net.rs
similarity index 94%
rename from rpc/src/impls/net.rs
rename to rpc/src/v1/impls/net.rs
index 20ed4d077..7bf9cb248 100644
--- a/rpc/src/impls/net.rs
+++ b/rpc/src/v1/impls/net.rs
@@ -1,6 +1,6 @@
 //! Net rpc implementation.
 use jsonrpc_core::*;
-use traits::Net;
+use v1::traits::Net;
 
 /// Net rpc implementation.
 pub struct NetClient;
diff --git a/rpc/src/impls/web3.rs b/rpc/src/v1/impls/web3.rs
similarity index 95%
rename from rpc/src/impls/web3.rs
rename to rpc/src/v1/impls/web3.rs
index 0188aa179..5117ebf16 100644
--- a/rpc/src/impls/web3.rs
+++ b/rpc/src/v1/impls/web3.rs
@@ -1,6 +1,6 @@
 //! Web3 rpc implementation.
 use jsonrpc_core::*;
-use traits::Web3;
+use v1::traits::Web3;
 
 /// Web3 rpc implementation.
 pub struct Web3Client;
diff --git a/rpc/src/v1/mod.rs b/rpc/src/v1/mod.rs
new file mode 100644
index 000000000..a7da1a441
--- /dev/null
+++ b/rpc/src/v1/mod.rs
@@ -0,0 +1,10 @@
+//! Ethcore rpc v1.
+//! 
+//! Compliant with ethereum rpc.
+
+pub mod traits;
+mod impls;
+mod types;
+
+pub use self::traits::{Web3, Eth, EthFilter, Net};
+pub use self::impls::*;
diff --git a/rpc/src/traits/eth.rs b/rpc/src/v1/traits/eth.rs
similarity index 100%
rename from rpc/src/traits/eth.rs
rename to rpc/src/v1/traits/eth.rs
diff --git a/rpc/src/traits/mod.rs b/rpc/src/v1/traits/mod.rs
similarity index 100%
rename from rpc/src/traits/mod.rs
rename to rpc/src/v1/traits/mod.rs
diff --git a/rpc/src/traits/net.rs b/rpc/src/v1/traits/net.rs
similarity index 100%
rename from rpc/src/traits/net.rs
rename to rpc/src/v1/traits/net.rs
diff --git a/rpc/src/traits/web3.rs b/rpc/src/v1/traits/web3.rs
similarity index 100%
rename from rpc/src/traits/web3.rs
rename to rpc/src/v1/traits/web3.rs
diff --git a/rpc/src/types/block.rs b/rpc/src/v1/types/block.rs
similarity index 100%
rename from rpc/src/types/block.rs
rename to rpc/src/v1/types/block.rs
diff --git a/rpc/src/types/mod.rs b/rpc/src/v1/types/mod.rs
similarity index 100%
rename from rpc/src/types/mod.rs
rename to rpc/src/v1/types/mod.rs