From 8a450592b49e92de42cc151f7de86c41dde2e95d Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Wed, 27 Jan 2016 19:41:50 +0400 Subject: [PATCH 1/8] refactoring of temp path spawning in several places --- src/blockchain.rs | 22 ++++++++-------------- src/tests/chain.rs | 8 +++----- src/tests/mod.rs | 2 +- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/blockchain.rs b/src/blockchain.rs index fb3755ff2..753b83587 100644 --- a/src/blockchain.rs +++ b/src/blockchain.rs @@ -618,20 +618,18 @@ impl BlockChain { #[cfg(test)] mod tests { - use std::env; use std::str::FromStr; use rustc_serialize::hex::FromHex; use util::hash::*; use blockchain::*; + use tests::helpers::*; #[test] fn valid_tests_extra32() { let genesis = "f901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0925002c3260b44e44c3edebad1cc442142b03020209df1ab8bb86752edbd2cd7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a0363659b251bf8b819179874c8cce7b9b983d7f3704cbb58a3b334431f7032871889032d09c281e1236c0c0".from_hex().unwrap(); - let mut dir = env::temp_dir(); - dir.push(H32::random().hex()); - - let bc = BlockChain::new(&genesis, &dir); + let temp = RandomTempPath::new(); + let bc = BlockChain::new(&genesis, temp.as_path()); let genesis_hash = H256::from_str("3caa2203f3d7c136c0295ed128a7d31cea520b1ca5e27afe17d0853331798942").unwrap(); @@ -674,10 +672,8 @@ mod tests { // b3a is a part of canon chain, whereas b3b is part of sidechain let best_block_hash = H256::from_str("c208f88c9f5bf7e00840439742c12e5226d9752981f3ec0521bdcb6dd08af277").unwrap(); - let mut dir = env::temp_dir(); - dir.push(H32::random().hex()); - - let bc = BlockChain::new(&genesis, &dir); + let temp = RandomTempPath::new(); + let bc = BlockChain::new(&genesis, temp.as_path()); bc.insert_block(&b1); bc.insert_block(&b2); bc.insert_block(&b3a); @@ -754,18 +750,16 @@ mod tests { let genesis_hash = H256::from_str("5716670833ec874362d65fea27a7cd35af5897d275b31a44944113111e4e96d2").unwrap(); let b1_hash = H256::from_str("437e51676ff10756fcfee5edd9159fa41dbcb1b2c592850450371cbecd54ee4f").unwrap(); - let mut dir = env::temp_dir(); - dir.push(H32::random().hex()); - + let temp = RandomTempPath::new(); { - let bc = BlockChain::new(&genesis, &dir); + let bc = BlockChain::new(&genesis, temp.as_path()); assert_eq!(bc.best_block_hash(), genesis_hash); bc.insert_block(&b1); assert_eq!(bc.best_block_hash(), b1_hash); } { - let bc = BlockChain::new(&genesis, &dir); + let bc = BlockChain::new(&genesis, temp.as_path()); assert_eq!(bc.best_block_hash(), b1_hash); } } diff --git a/src/tests/chain.rs b/src/tests/chain.rs index 42b4ee78a..295cd3e91 100644 --- a/src/tests/chain.rs +++ b/src/tests/chain.rs @@ -1,9 +1,9 @@ -use std::env; use super::test_common::*; use client::{BlockChainClient,Client}; use pod_state::*; use block::Block; use ethereum; +use super::helpers::*; fn do_json_test(json_data: &[u8]) -> Vec { let json = Json::from_str(::std::str::from_utf8(json_data).unwrap()).expect("Json is invalid"); @@ -28,10 +28,9 @@ fn do_json_test(json_data: &[u8]) -> Vec { spec.overwrite_genesis(test.find("genesisBlockHeader").unwrap()); assert!(spec.is_state_root_valid()); - let mut dir = env::temp_dir(); - dir.push(H32::random().hex()); + let temp = RandomTempPath::new(); { - let client = Client::new(spec, &dir, IoChannel::disconnected()).unwrap(); + let client = Client::new(spec, temp.as_path(), IoChannel::disconnected()).unwrap(); for (b, is_valid) in blocks.into_iter() { if Block::is_good(&b) { let _ = client.import_block(b.clone()); @@ -42,7 +41,6 @@ fn do_json_test(json_data: &[u8]) -> Vec { } fail_unless(client.chain_info().best_block_hash == H256::from_json(&test["lastblockhash"])); } - fs::remove_dir_all(&dir).unwrap(); } if !fail { flush(format!("ok\n")); diff --git a/src/tests/mod.rs b/src/tests/mod.rs index 17da72d77..19e8e9144 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -6,4 +6,4 @@ mod executive; mod state; mod client; mod chain; -mod helpers; \ No newline at end of file +pub mod helpers; \ No newline at end of file From 382b22b93b997d944ea91a4fd328abcdee502b47 Mon Sep 17 00:00:00 2001 From: Tomusdrw Date: Wed, 27 Jan 2016 17:25:19 +0100 Subject: [PATCH 2/8] Fixing suicide with self-refund to be consistent with CPP. --- src/externalities.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/externalities.rs b/src/externalities.rs index f1b8c1958..6a874330c 100644 --- a/src/externalities.rs +++ b/src/externalities.rs @@ -215,8 +215,13 @@ impl<'a> Ext for Externalities<'a> { fn suicide(&mut self, refund_address: &Address) { let address = self.origin_info.address.clone(); let balance = self.balance(&address); - trace!("Suiciding {} -> {} (xfer: {})", address, refund_address, balance); - self.state.transfer_balance(&address, refund_address, &balance); + if &address == refund_address { + // TODO [todr] To be consisted with CPP client we set balance to 0 in that case. + self.state.sub_balance(&address, &balance); + } else { + trace!("Suiciding {} -> {} (xfer: {})", address, refund_address, balance); + self.state.transfer_balance(&address, refund_address, &balance); + } self.substate.suicides.insert(address); } From 09b9001c65279c0449635f17ecd65e5b2322ce34 Mon Sep 17 00:00:00 2001 From: debris Date: Wed, 27 Jan 2016 18:17:20 +0100 Subject: [PATCH 3/8] stub for rpc eth methods --- rpc/src/lib.rs | 4 -- rpc/src/v1/traits/eth.rs | 132 +++++++++++++++++++++++++++++++------- rpc/src/v1/traits/mod.rs | 5 ++ rpc/src/v1/traits/net.rs | 4 +- rpc/src/v1/traits/web3.rs | 2 +- 5 files changed, 116 insertions(+), 31 deletions(-) diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index 7bc1d6987..a27afb5f6 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -13,10 +13,6 @@ extern crate ethcore; use self::jsonrpc_core::{IoHandler, IoDelegate}; -macro_rules! rpcerr { - () => (Err(Error::internal_error())) -} - pub mod v1; /// Http server. diff --git a/rpc/src/v1/traits/eth.rs b/rpc/src/v1/traits/eth.rs index 25756a713..1586e7069 100644 --- a/rpc/src/v1/traits/eth.rs +++ b/rpc/src/v1/traits/eth.rs @@ -5,41 +5,125 @@ use jsonrpc_core::*; /// Eth rpc interface. pub trait Eth: Sized + Send + Sync + 'static { /// Returns protocol version. - fn protocol_version(&self, _: Params) -> Result { rpcerr!() } - - /// Returns block author. - fn author(&self, _: Params) -> Result { rpcerr!() } - - /// Returns current gas_price. - fn gas_price(&self, _: Params) -> Result { rpcerr!() } - - /// Returns highest block number. - fn block_number(&self, _: Params) -> Result { rpcerr!() } - - /// Returns block with given index / hash. - fn block(&self, _: Params) -> Result { rpcerr!() } - - /// Returns true if client is actively mining new blocks. - fn is_mining(&self, _: Params) -> Result { rpcerr!() } + fn protocol_version(&self, _: Params) -> Result { rpc_unimplemented!() } /// Returns the number of hashes per second that the node is mining with. - fn hashrate(&self, _: Params) -> Result { rpcerr!() } + fn hashrate(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns block author. + fn author(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns true if client is actively mining new blocks. + fn is_mining(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns current gas_price. + fn gas_price(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns accounts list. + fn accounts(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns highest block number. + fn block_number(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns balance of the given account. + fn balance(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns content of the storage at given address. + fn storage_at(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns block with given index / hash. + fn block(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns the number of transactions sent from given address at given time (block number). + fn transaction_count(&self, _: Params) -> Result { rpc_unimplemented!() } /// Returns the number of transactions in a block. - fn block_transaction_count(&self, _: Params) -> Result { rpcerr!() } + fn block_transaction_count(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns the number of uncles in a given block. + fn block_uncles_count(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns the code at given address at given time (block number). + fn code_at(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Sends transaction. + fn send_transaction(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Call contract. + fn call(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Estimate gas needed for execution of given contract. + fn estimate_gas(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns transaction at given block and index. + fn transaction_at(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns transaction receipt. + fn transaction_receipt(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns an uncles at given block and index. + fn uncle_at(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns available compilers. + fn compilers(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Compiles lll code. + fn compile_lll(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Compiles solidity. + fn compile_solidity(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Compiles serpent. + fn compile_serpent(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns logs matching given filter object. + fn logs(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns the hash of the current block, the seedHash, and the boundary condition to be met. + fn work(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Used for submitting a proof-of-work solution. + fn submit_work(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Used for submitting mining hashrate. + fn submit_hashrate(&self, _: Params) -> Result { rpc_unimplemented!() } /// Should be used to convert object to io delegate. fn to_delegate(self) -> IoDelegate { let mut delegate = IoDelegate::new(Arc::new(self)); delegate.add_method("eth_protocolVersion", Eth::protocol_version); + delegate.add_method("eth_hashrate", Eth::hashrate); delegate.add_method("eth_coinbase", Eth::author); + delegate.add_method("eth_mining", Eth::is_mining); delegate.add_method("eth_gasPrice", Eth::gas_price); + delegate.add_method("eth_accounts", Eth::accounts); delegate.add_method("eth_blockNumber", Eth::block_number); + delegate.add_method("eth_balance", Eth::balance); + delegate.add_method("eth_getStorageAt", Eth::storage_at); + delegate.add_method("eth_getTransactionCount", Eth::transaction_count); + delegate.add_method("eth_getBlockTransactionCountByHash", Eth::block_transaction_count); + delegate.add_method("eth_getBlockTransactionCountByNumber", Eth::block_transaction_count); + delegate.add_method("eth_getUncleCountByBlockHash", Eth::block_uncles_count); + delegate.add_method("eth_getUncleCountByBlockNumber", Eth::block_uncles_count); + delegate.add_method("eth_code", Eth::code_at); + delegate.add_method("eth_sendTransaction", Eth::send_transaction); + delegate.add_method("eth_call", Eth::call); + delegate.add_method("eth_estimateGas", Eth::estimate_gas); delegate.add_method("eth_getBlockByHash", Eth::block); delegate.add_method("eth_getBlockByNumber", Eth::block); - delegate.add_method("eth_mining", Eth::is_mining); - delegate.add_method("eth_hashrate", Eth::hashrate); - delegate.add_method("eth_getBlockTransactionCountByNumber", Eth::block_transaction_count); + delegate.add_method("eth_getTransactionByBlockHashAndIndex", Eth::transaction_at); + delegate.add_method("eth_getTransactionByBlockNumberAndIndex", Eth::transaction_at); + delegate.add_method("eth_getTransactionReceipt", Eth::transaction_receipt); + delegate.add_method("eth_getUncleByBlockHashAndIndex", Eth::uncle_at); + delegate.add_method("eth_getUncleByBlockNumberAndIndex", Eth::uncle_at); + delegate.add_method("eth_getCompilers", Eth::compilers); + delegate.add_method("eth_compileLLL", Eth::compile_lll); + delegate.add_method("eth_compileSolidity", Eth::compile_solidity); + delegate.add_method("eth_compileSerpent", Eth::compile_serpent); + delegate.add_method("eth_getLogs", Eth::logs); + delegate.add_method("eth_getWork", Eth::work); + delegate.add_method("eth_submitWork", Eth::submit_work); + delegate.add_method("eth_submitHashrate", Eth::submit_hashrate); delegate } } @@ -48,13 +132,13 @@ pub trait Eth: Sized + Send + Sync + 'static { // TODO: do filters api properly pub trait EthFilter: Sized + Send + Sync + 'static { /// Returns id of new block filter - fn new_block_filter(&self, _: Params) -> Result { rpcerr!() } + fn new_block_filter(&self, _: Params) -> Result { rpc_unimplemented!() } /// Returns id of new block filter - fn new_pending_transaction_filter(&self, _: Params) -> Result { rpcerr!() } + fn new_pending_transaction_filter(&self, _: Params) -> Result { rpc_unimplemented!() } /// Returns filter changes since last poll - fn filter_changes(&self, _: Params) -> Result { rpcerr!() } + fn filter_changes(&self, _: Params) -> Result { rpc_unimplemented!() } /// Should be used to convert object to io delegate. fn to_delegate(self) -> IoDelegate { diff --git a/rpc/src/v1/traits/mod.rs b/rpc/src/v1/traits/mod.rs index 2fa52d538..70c825175 100644 --- a/rpc/src/v1/traits/mod.rs +++ b/rpc/src/v1/traits/mod.rs @@ -1,4 +1,9 @@ //! Ethereum rpc interfaces. + +macro_rules! rpc_unimplemented { + () => (Err(Error::internal_error())) +} + pub mod web3; pub mod eth; pub mod net; diff --git a/rpc/src/v1/traits/net.rs b/rpc/src/v1/traits/net.rs index 4df8d7114..9196503d2 100644 --- a/rpc/src/v1/traits/net.rs +++ b/rpc/src/v1/traits/net.rs @@ -5,10 +5,10 @@ use jsonrpc_core::*; /// Net rpc interface. pub trait Net: Sized + Send + Sync + 'static { /// Returns protocol version. - fn version(&self, _: Params) -> Result { rpcerr!() } + fn version(&self, _: Params) -> Result { rpc_unimplemented!() } /// Returns number of peers connected to node. - fn peer_count(&self, _: Params) -> Result { rpcerr!() } + fn peer_count(&self, _: Params) -> Result { rpc_unimplemented!() } /// Should be used to convert object to io delegate. fn to_delegate(self) -> IoDelegate { diff --git a/rpc/src/v1/traits/web3.rs b/rpc/src/v1/traits/web3.rs index 8e73d4304..118316155 100644 --- a/rpc/src/v1/traits/web3.rs +++ b/rpc/src/v1/traits/web3.rs @@ -5,7 +5,7 @@ use jsonrpc_core::*; /// Web3 rpc interface. pub trait Web3: Sized + Send + Sync + 'static { /// Returns current client version. - fn client_version(&self, _: Params) -> Result { rpcerr!() } + fn client_version(&self, _: Params) -> Result { rpc_unimplemented!() } /// Should be used to convert object to io delegate. fn to_delegate(self) -> IoDelegate { From b13d68c7e99319420b0ee500308635442c8594d2 Mon Sep 17 00:00:00 2001 From: debris Date: Wed, 27 Jan 2016 19:00:42 +0100 Subject: [PATCH 4/8] missing eth filter interface --- rpc/src/v1/traits/eth.rs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/rpc/src/v1/traits/eth.rs b/rpc/src/v1/traits/eth.rs index 1586e7069..3dcdfdf05 100644 --- a/rpc/src/v1/traits/eth.rs +++ b/rpc/src/v1/traits/eth.rs @@ -131,21 +131,33 @@ pub trait Eth: Sized + Send + Sync + 'static { /// Eth filters rpc api (polling). // TODO: do filters api properly pub trait EthFilter: Sized + Send + Sync + 'static { - /// Returns id of new block filter + /// Returns id of new filter. + fn new_filter(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Returns id of new block filter. fn new_block_filter(&self, _: Params) -> Result { rpc_unimplemented!() } - /// Returns id of new block filter + /// Returns id of new block filter. fn new_pending_transaction_filter(&self, _: Params) -> Result { rpc_unimplemented!() } - /// Returns filter changes since last poll + /// Returns filter changes since last poll. fn filter_changes(&self, _: Params) -> Result { rpc_unimplemented!() } + /// Returns filter logs. + fn filter_logs(&self, _: Params) -> Result { rpc_unimplemented!() } + + /// Uninstalls filter. + fn uninstall_filter(&self, _: Params) -> Result { rpc_unimplemented!() } + /// Should be used to convert object to io delegate. fn to_delegate(self) -> IoDelegate { let mut delegate = IoDelegate::new(Arc::new(self)); + delegate.add_method("eth_newFilter", EthFilter::new_filter); delegate.add_method("eth_newBlockFilter", EthFilter::new_block_filter); delegate.add_method("eth_newPendingTransactionFilter", EthFilter::new_pending_transaction_filter); delegate.add_method("eth_getFilterChanges", EthFilter::filter_changes); + delegate.add_method("eth_getFilterLogs", EthFilter::filter_logs); + delegate.add_method("eth_uninstallFilter", EthFilter::uninstall_filter); delegate } } From f8568e10b7fe4ffbc525188ca360cd8e09fd55e8 Mon Sep 17 00:00:00 2001 From: debris Date: Wed, 27 Jan 2016 19:03:12 +0100 Subject: [PATCH 5/8] missing net_ methods --- rpc/src/v1/traits/net.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rpc/src/v1/traits/net.rs b/rpc/src/v1/traits/net.rs index 9196503d2..84877cab7 100644 --- a/rpc/src/v1/traits/net.rs +++ b/rpc/src/v1/traits/net.rs @@ -10,11 +10,16 @@ pub trait Net: Sized + Send + Sync + 'static { /// Returns number of peers connected to node. fn peer_count(&self, _: Params) -> Result { rpc_unimplemented!() } + /// Returns true if client is actively listening for network connections. + /// Otherwise false. + fn is_listening(&self, _: Params) -> Result { rpc_unimplemented!() } + /// Should be used to convert object to io delegate. fn to_delegate(self) -> IoDelegate { let mut delegate = IoDelegate::new(Arc::new(self)); delegate.add_method("net_version", Net::version); delegate.add_method("net_peerCount", Net::peer_count); + delegate.add_method("net_listening", Net::is_listening); delegate } } From 07d6965ce70f9845ed8b577ff7c1dd98640442c9 Mon Sep 17 00:00:00 2001 From: debris Date: Thu, 28 Jan 2016 10:54:49 +0100 Subject: [PATCH 6/8] rpc net methods returns real peer count && protocol version --- bin/src/main.rs | 8 ++++---- rpc/src/v1/impls/net.rs | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/bin/src/main.rs b/bin/src/main.rs index 190bab311..3d4199fcf 100644 --- a/bin/src/main.rs +++ b/bin/src/main.rs @@ -53,19 +53,19 @@ fn setup_log(init: &str) { #[cfg(feature = "rpc")] -fn setup_rpc_server(client: Arc) { +fn setup_rpc_server(client: Arc, sync: Arc) { use rpc::v1::*; let mut server = rpc::HttpServer::new(1); server.add_delegate(Web3Client::new().to_delegate()); server.add_delegate(EthClient::new(client.clone()).to_delegate()); server.add_delegate(EthFilterClient::new(client).to_delegate()); - server.add_delegate(NetClient::new().to_delegate()); + server.add_delegate(NetClient::new(sync).to_delegate()); server.start_async("127.0.0.1:3030"); } #[cfg(not(feature = "rpc"))] -fn setup_rpc_server(_client: Arc) { +fn setup_rpc_server(_client: Arc, _sync: Arc) { } fn main() { @@ -81,7 +81,7 @@ fn main() { let mut net_settings = NetworkConfiguration::new(); net_settings.boot_nodes = init_nodes; let mut service = ClientService::start(spec, net_settings).unwrap(); - setup_rpc_server(service.client()); + setup_rpc_server(service.client(), service.sync()); let io_handler = Arc::new(ClientIoHandler { client: service.client(), info: Default::default(), sync: service.sync() }); service.io().register_handler(io_handler).expect("Error registering IO handler"); diff --git a/rpc/src/v1/impls/net.rs b/rpc/src/v1/impls/net.rs index 7bf9cb248..dff351c33 100644 --- a/rpc/src/v1/impls/net.rs +++ b/rpc/src/v1/impls/net.rs @@ -1,21 +1,29 @@ //! Net rpc implementation. +use std::sync::Arc; use jsonrpc_core::*; +use ethcore::sync::EthSync; use v1::traits::Net; /// Net rpc implementation. -pub struct NetClient; +pub struct NetClient { + sync: Arc +} impl NetClient { /// Creates new NetClient. - pub fn new() -> Self { NetClient } + pub fn new(sync: Arc) -> Self { + NetClient { + sync: sync + } + } } impl Net for NetClient { fn version(&self, _: Params) -> Result { - Ok(Value::U64(63)) + Ok(Value::U64(self.sync.status().protocol_version as u64)) } fn peer_count(&self, _params: Params) -> Result { - Ok(Value::U64(0)) + Ok(Value::U64(self.sync.status().num_peers as u64)) } } From 87edeae078593f9c8511fb0a3ece9e48f0cedd44 Mon Sep 17 00:00:00 2001 From: debris Date: Thu, 28 Jan 2016 11:21:06 +0100 Subject: [PATCH 7/8] fixed tests submodule branch --- .gitmodules | 1 + res/ethereum/tests | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 84843f000..4174eb2e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "res/ethereum/tests"] path = res/ethereum/tests url = git@github.com:ethereum/tests + branch = develop diff --git a/res/ethereum/tests b/res/ethereum/tests index dc86e6359..c670b1d8c 160000 --- a/res/ethereum/tests +++ b/res/ethereum/tests @@ -1 +1 @@ -Subproject commit dc86e6359675440aea59ddb48648a01c799925d8 +Subproject commit c670b1d8c9f09593a6758ab2c099360e16c7c25b From c2134993a5266848ba3fb4089d78c567d0dbe050 Mon Sep 17 00:00:00 2001 From: debris Date: Thu, 28 Jan 2016 18:37:14 +0100 Subject: [PATCH 8/8] fix submodule version --- res/ethereum/tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/ethereum/tests b/res/ethereum/tests index e838fd909..c670b1d8c 160000 --- a/res/ethereum/tests +++ b/res/ethereum/tests @@ -1 +1 @@ -Subproject commit e838fd90998fc5502d0b7c9427a4c231f9a6953d +Subproject commit c670b1d8c9f09593a6758ab2c099360e16c7c25b