diff --git a/Cargo.toml b/Cargo.toml index f281cb854..859dadea2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,5 +41,5 @@ path = "parity/main.rs" name = "parity" [profile.release] -debug = false +debug = true lto = false diff --git a/devtools/README.md b/devtools/README.md deleted file mode 100644 index 5d5144689..000000000 --- a/devtools/README.md +++ /dev/null @@ -1 +0,0 @@ -# ethcore dev tools diff --git a/ethcore/src/action_params.rs b/ethcore/src/action_params.rs index fa40d30a0..2f5aa3340 100644 --- a/ethcore/src/action_params.rs +++ b/ethcore/src/action_params.rs @@ -16,6 +16,7 @@ //! Evm input params. use common::*; +use ethjson; /// Transaction value #[derive(Clone, Debug)] @@ -67,3 +68,19 @@ impl Default for ActionParams { } } } + +impl From for ActionParams { + fn from(t: ethjson::vm::Transaction) -> Self { + ActionParams { + code_address: Address::new(), + address: t.address.into(), + sender: t.sender.into(), + origin: t.origin.into(), + code: Some(t.code.into()), + data: Some(t.data.into()), + gas: t.gas.into(), + gas_price: t.gas_price.into(), + value: ActionValue::Transfer(t.value.into()), + } + } +} diff --git a/ethcore/src/env_info.rs b/ethcore/src/env_info.rs index 02fc5188c..1a4e71c67 100644 --- a/ethcore/src/env_info.rs +++ b/ethcore/src/env_info.rs @@ -16,6 +16,7 @@ use util::*; use header::BlockNumber; +use ethjson; /// Simple vector of hashes, should be at most 256 items large, can be smaller if being used /// for a block whose number is less than 257. @@ -69,6 +70,21 @@ impl FromJson for EnvInfo { } } +impl From for EnvInfo { + fn from(e: ethjson::vm::Env) -> Self { + let number = e.number.into(); + EnvInfo { + number: number, + author: e.author.into(), + difficulty: e.difficulty.into(), + gas_limit: e.gas_limit.into(), + timestamp: e.timestamp.into(), + last_hashes: (1..cmp::min(number + 1, 257)).map(|i| format!("{}", number - i).as_bytes().sha3()).collect(), + gas_used: U256::zero(), + } + } +} + #[cfg(test)] mod tests { extern crate rustc_serialize; diff --git a/ethcore/src/evm/instructions.rs b/ethcore/src/evm/instructions.rs index 623868618..6a1a06ba9 100644 --- a/ethcore/src/evm/instructions.rs +++ b/ethcore/src/evm/instructions.rs @@ -137,6 +137,7 @@ impl InstructionInfo { } } +#[cfg_attr(rustfmt, rustfmt_skip)] /// Return details about specific instruction pub fn get_info (instruction: Instruction) -> InstructionInfo { match instruction { @@ -301,7 +302,7 @@ pub const EXP: Instruction = 0x0a; pub const SIGNEXTEND: Instruction = 0x0b; /// less-than comparision -pub const LT: Instruction = 0x10; +pub const LT: Instruction = 0x10; /// greater-than comparision pub const GT: Instruction = 0x11; /// signed less-than comparision @@ -324,10 +325,10 @@ pub const NOT: Instruction = 0x19; pub const BYTE: Instruction = 0x1a; /// compute SHA3-256 hash -pub const SHA3: Instruction = 0x20; +pub const SHA3: Instruction = 0x20; /// get address of currently executing account -pub const ADDRESS: Instruction = 0x30; +pub const ADDRESS: Instruction = 0x30; /// get balance of the given account pub const BALANCE: Instruction = 0x31; /// get execution origination address @@ -367,7 +368,7 @@ pub const DIFFICULTY: Instruction = 0x44; pub const GASLIMIT: Instruction = 0x45; /// remove item from stack -pub const POP: Instruction = 0x50; +pub const POP: Instruction = 0x50; /// load word from memory pub const MLOAD: Instruction = 0x51; /// save word to memory @@ -392,7 +393,7 @@ pub const GAS: Instruction = 0x5a; pub const JUMPDEST: Instruction = 0x5b; /// place 1 byte item on stack -pub const PUSH1: Instruction = 0x60; +pub const PUSH1: Instruction = 0x60; /// place 2 byte item on stack pub const PUSH2: Instruction = 0x61; /// place 3 byte item on stack @@ -457,7 +458,7 @@ pub const PUSH31: Instruction = 0x7e; pub const PUSH32: Instruction = 0x7f; /// copies the highest item in the stack to the top of the stack -pub const DUP1: Instruction = 0x80; +pub const DUP1: Instruction = 0x80; /// copies the second highest item in the stack to the top of the stack pub const DUP2: Instruction = 0x81; /// copies the third highest item in the stack to the top of the stack @@ -490,7 +491,7 @@ pub const DUP15: Instruction = 0x8e; pub const DUP16: Instruction = 0x8f; /// swaps the highest and second highest value on the stack -pub const SWAP1: Instruction = 0x90; +pub const SWAP1: Instruction = 0x90; /// swaps the highest and third highest value on the stack pub const SWAP2: Instruction = 0x91; /// swaps the highest and 4th highest value on the stack @@ -523,7 +524,7 @@ pub const SWAP15: Instruction = 0x9e; pub const SWAP16: Instruction = 0x9f; /// Makes a log entry; no topics. -pub const LOG0: Instruction = 0xa0; +pub const LOG0: Instruction = 0xa0; /// Makes a log entry; 1 topic. pub const LOG1: Instruction = 0xa1; /// Makes a log entry; 2 topics. @@ -536,7 +537,7 @@ pub const LOG4: Instruction = 0xa4; pub const MAX_NO_OF_TOPICS : usize = 4; /// create a new account with associated code -pub const CREATE: Instruction = 0xf0; +pub const CREATE: Instruction = 0xf0; /// message-call into an account pub const CALL: Instruction = 0xf1; /// message-call with another account's code only @@ -546,5 +547,5 @@ pub const RETURN: Instruction = 0xf3; /// like CALLCODE but keeps caller's value and sender pub const DELEGATECALL: Instruction = 0xf4; /// halt execution and register account for later deletion -pub const SUICIDE: Instruction = 0xff; +pub const SUICIDE: Instruction = 0xff; diff --git a/ethcore/src/json_tests/chain.rs b/ethcore/src/json_tests/chain.rs index a2e6a5659..a1154f6a9 100644 --- a/ethcore/src/json_tests/chain.rs +++ b/ethcore/src/json_tests/chain.rs @@ -28,7 +28,7 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec { let tests = ethjson::blockchain::Test::load(json_data).unwrap(); let mut failed = Vec::new(); - for (name, blockchain) in tests.deref() { + for (name, blockchain) in tests.into_iter() { let mut fail = false; { let mut fail_unless = |cond: bool| if !cond && !fail { @@ -61,7 +61,7 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec { client.import_verified_blocks(&IoChannel::disconnected()); } } - fail_unless(client.chain_info().best_block_hash == blockchain.best_block.clone().into()); + fail_unless(client.chain_info().best_block_hash == blockchain.best_block.into()); } } diff --git a/ethcore/src/json_tests/executive.rs b/ethcore/src/json_tests/executive.rs index dbb9bb6ab..283394204 100644 --- a/ethcore/src/json_tests/executive.rs +++ b/ethcore/src/json_tests/executive.rs @@ -25,6 +25,7 @@ use ethereum; use externalities::*; use substate::*; use tests::helpers::*; +use ethjson; struct TestEngineFrontier { vm_factory: Factory, @@ -53,6 +54,7 @@ impl Engine for TestEngineFrontier { } } +#[derive(Debug, PartialEq)] struct CallCreate { data: Bytes, destination: Option
, @@ -60,6 +62,18 @@ struct CallCreate { value: U256 } +impl From for CallCreate { + fn from(c: ethjson::vm::Call) -> Self { + let dst: Option<_> = c.destination.into(); + CallCreate { + data: c.data.into(), + destination: dst.map(Into::into), + gas_limit: c.gas_limit.into(), + value: c.value.into() + } + } +} + /// Tiny wrapper around executive externalities. /// Stores callcreates. struct TestExt<'a> { @@ -174,58 +188,26 @@ fn do_json_test(json_data: &[u8]) -> Vec { .collect() } -fn do_json_test_for(vm: &VMType, json_data: &[u8]) -> Vec { - let json = Json::from_str(::std::str::from_utf8(json_data).unwrap()).expect("Json is invalid"); +fn do_json_test_for(vm_type: &VMType, json_data: &[u8]) -> Vec { + let tests = ethjson::vm::Test::load(json_data).unwrap(); let mut failed = Vec::new(); - for (name, test) in json.as_object().unwrap() { + + for (name, vm) in tests.into_iter() { println!("name: {:?}", name); - // sync io is usefull when something crashes in jit - // ::std::io::stdout().write(&name.as_bytes()); - // ::std::io::stdout().write(b"\n"); - // ::std::io::stdout().flush(); let mut fail = false; - //let mut fail_unless = |cond: bool| if !cond && !fail { failed.push(name.to_string()); fail = true }; + let mut fail_unless = |cond: bool, s: &str | if !cond && !fail { - failed.push(format!("[{}] {}: {}", vm, name, s)); + failed.push(format!("[{}] {}: {}", vm_type, name, s)); fail = true }; - // test env + let out_of_gas = vm.out_of_gas(); let mut state_result = get_temp_state(); let mut state = state_result.reference_mut(); - - test.find("pre").map(|pre| for (addr, s) in pre.as_object().unwrap() { - let address = Address::from(addr.as_ref()); - let balance = xjson!(&s["balance"]); - let code = xjson!(&s["code"]); - let _nonce: U256 = xjson!(&s["nonce"]); - - state.new_contract(&address, balance); - state.init_code(&address, code); - BTreeMap::from_json(&s["storage"]).into_iter().foreach(|(k, v)| state.set_storage(&address, k, v)); - }); - - let info = test.find("env").map(|env| { - EnvInfo::from_json(env) - }).unwrap_or_default(); - - let engine = TestEngineFrontier::new(1, vm.clone()); - - // params - let mut params = ActionParams::default(); - test.find("exec").map(|exec| { - params.address = xjson!(&exec["address"]); - params.sender = xjson!(&exec["caller"]); - params.origin = xjson!(&exec["origin"]); - params.code = xjson!(&exec["code"]); - params.data = xjson!(&exec["data"]); - params.gas = xjson!(&exec["gas"]); - params.gas_price = xjson!(&exec["gasPrice"]); - params.value = ActionValue::Transfer(xjson!(&exec["value"])); - }); - - let out_of_gas = test.find("callcreates").map(|_calls| { - }).is_none(); + state.populate_from(From::from(vm.pre_state.clone())); + let info = From::from(vm.env); + let engine = TestEngineFrontier::new(1, vm_type.clone()); + let params = ActionParams::from(vm.transaction); let mut substate = Substate::new(false); let mut output = vec![]; @@ -247,44 +229,37 @@ fn do_json_test_for(vm: &VMType, json_data: &[u8]) -> Vec { (res, ex.callcreates) }; - // then validate match res { Err(_) => fail_unless(out_of_gas, "didn't expect to run out of gas."), Ok(gas_left) => { - // println!("name: {}, gas_left : {:?}", name, gas_left); fail_unless(!out_of_gas, "expected to run out of gas."); - fail_unless(gas_left == xjson!(&test["gas"]), "gas_left is incorrect"); - fail_unless(output == Bytes::from_json(&test["out"]), "output is incorrect"); + fail_unless(Some(gas_left) == vm.gas_left.map(Into::into), "gas_left is incorrect"); + let vm_output: Option> = vm.output.map(Into::into); + fail_unless(Some(output) == vm_output, "output is incorrect"); - test.find("post").map(|pre| for (addr, s) in pre.as_object().unwrap() { - let address = Address::from(addr.as_ref()); - - fail_unless(state.code(&address).unwrap_or_else(|| vec![]) == Bytes::from_json(&s["code"]), "code is incorrect"); - fail_unless(state.balance(&address) == xjson!(&s["balance"]), "balance is incorrect"); - fail_unless(state.nonce(&address) == xjson!(&s["nonce"]), "nonce is incorrect"); - BTreeMap::from_json(&s["storage"]).iter().foreach(|(k, v)| fail_unless(&state.storage_at(&address, &k) == v, "storage is incorrect")); - }); - - let cc = test["callcreates"].as_array().unwrap(); - fail_unless(callcreates.len() == cc.len(), "callcreates does not match"); - for i in 0..cc.len() { - let callcreate = &callcreates[i]; - let expected = &cc[i]; - fail_unless(callcreate.data == Bytes::from_json(&expected["data"]), "callcreates data is incorrect"); - fail_unless(callcreate.destination == xjson!(&expected["destination"]), "callcreates destination is incorrect"); - fail_unless(callcreate.value == xjson!(&expected["value"]), "callcreates value is incorrect"); - fail_unless(callcreate.gas_limit == xjson!(&expected["gasLimit"]), "callcreates gas_limit is incorrect"); + for (address, account) in vm.post_state.unwrap().into_iter() { + let address = address.into(); + let code: Vec = account.code.into(); + fail_unless(state.code(&address).unwrap_or_else(Vec::new) == code, "code is incorrect"); + fail_unless(state.balance(&address) == account.balance.into(), "balance is incorrect"); + fail_unless(state.nonce(&address) == account.nonce.into(), "nonce is incorrect"); + account.storage.into_iter().foreach(|(k, v)| { + let key: U256 = k.into(); + let value: U256 = v.into(); + fail_unless(state.storage_at(&address, &From::from(key)) == From::from(value), "storage is incorrect"); + }); } - } - } - } + let calls: Option> = vm.calls.map(|c| c.into_iter().map(From::from).collect()); + fail_unless(Some(callcreates) == calls, "callcreates does not match"); + } + }; + } for f in &failed { println!("FAILED: {:?}", f); } - //assert!(false); failed } diff --git a/ethcore/src/pod_account.rs b/ethcore/src/pod_account.rs index 387679da9..623211ae6 100644 --- a/ethcore/src/pod_account.rs +++ b/ethcore/src/pod_account.rs @@ -19,7 +19,7 @@ use account::*; use account_db::*; use ethjson; -#[derive(Debug,Clone,PartialEq,Eq)] +#[derive(Debug, Clone, PartialEq, Eq)] /// An account, expressed as Plain-Old-Data (hence the name). /// Does not have a DB overlay cache, code hash or anything like that. pub struct PodAccount { diff --git a/ethcore/src/state_diff.rs b/ethcore/src/state_diff.rs index 2f3a0c8c8..6c41d167c 100644 --- a/ethcore/src/state_diff.rs +++ b/ethcore/src/state_diff.rs @@ -20,7 +20,7 @@ use pod_state::*; use account_diff::*; #[derive(Debug,Clone,PartialEq,Eq)] -/// Expression for the delta between two system states. Encoded the +/// Expression for the delta between two system states. Encoded the /// delta of every altered account. pub struct StateDiff (BTreeMap); @@ -41,6 +41,14 @@ impl fmt::Display for StateDiff { } } +impl Deref for StateDiff { + type Target = BTreeMap; + + fn deref(&self) -> &Self::Target { + &self.0 + } +} + #[cfg(test)] mod test { use common::*; diff --git a/fmt.sh b/fmt.sh new file mode 100755 index 000000000..a16d5ac1f --- /dev/null +++ b/fmt.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +RUSTFMT="rustfmt --write-mode overwrite" + +$RUSTFMT ./ethash/src/lib.rs +$RUSTFMT ./ethcore/src/lib.rs +$RUSTFMT ./evmjit/src/lib.rs +$RUSTFMT ./json/src/lib.rs +$RUSTFMT ./miner/src/lib.rs +$RUSTFMT ./parity/main.rs +$RUSTFMT ./rpc/src/lib.rs +$RUSTFMT ./sync/src/lib.rs +$RUSTFMT ./util/src/lib.rs + diff --git a/ipc/codegen/Cargo.toml b/ipc/codegen/Cargo.toml new file mode 100644 index 000000000..09d6a14bb --- /dev/null +++ b/ipc/codegen/Cargo.toml @@ -0,0 +1,27 @@ +[package] +name = "ethcore-ipc-codegen" +version = "1.1.0" +authors = ["Nikolay Volf"] +license = "GPL-3.0" +description = "Macros to auto-generate implementations for ipc call" +build = "build.rs" +keywords = ["ipc", "codegen"] + +[features] +default = ["with-syntex"] +nightly = ["quasi_macros"] +nightly-testing = ["clippy"] +with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"] + +[build-dependencies] +quasi_codegen = { version = "^0.8.0", optional = true } +syntex = { version = "^0.30.0", optional = true } + +[dependencies] +aster = { version = "^0.14.0", default-features = false } +clippy = { version = "^0.*", optional = true } +quasi = { version = "^0.8.0", default-features = false } +quasi_macros = { version = "^0.8.0", optional = true } +syntex = { version = "^0.30.0", optional = true } +syntex_syntax = { version = "^0.30.0", optional = true } +"ethcore-ipc" = { path = "../rpc"} diff --git a/ipc/codegen/build.rs b/ipc/codegen/build.rs new file mode 100644 index 000000000..82f990188 --- /dev/null +++ b/ipc/codegen/build.rs @@ -0,0 +1,45 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + + +#[cfg(feature = "with-syntex")] +mod inner { + extern crate syntex; + extern crate quasi_codegen; + + use std::env; + use std::path::Path; + + pub fn main() { + let out_dir = env::var_os("OUT_DIR").unwrap(); + let mut registry = syntex::Registry::new(); + quasi_codegen::register(&mut registry); + + let src = Path::new("src/lib.rs.in"); + let dst = Path::new(&out_dir).join("lib.rs"); + + registry.expand("", &src, &dst).unwrap(); + } +} + +#[cfg(not(feature = "with-syntex"))] +mod inner { + pub fn main() {} +} + +fn main() { + inner::main(); +} diff --git a/ipc/codegen/src/codegen.rs b/ipc/codegen/src/codegen.rs new file mode 100644 index 000000000..69160bed5 --- /dev/null +++ b/ipc/codegen/src/codegen.rs @@ -0,0 +1,284 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +use aster; + +use syntax::ast::{ + MetaItem, + Item, + ImplItemKind, + ImplItem, + MethodSig, + Arg, + PatKind, + FunctionRetTy, +}; + +use syntax::ast; +use syntax::codemap::Span; +use syntax::ext::base::{Annotatable, ExtCtxt}; +use syntax::ext::build::AstBuilder; +use syntax::ptr::P; + +pub struct Error; + +pub fn expand_ipc_implementation( + cx: &mut ExtCtxt, + span: Span, + meta_item: &MetaItem, + annotatable: &Annotatable, + push: &mut FnMut(Annotatable) +) { + let item = match *annotatable { + Annotatable::Item(ref item) => item, + _ => { + cx.span_err(meta_item.span, "`#[derive(Ipc)]` may only be applied to struct implementations"); + return; + } + }; + + let builder = aster::AstBuilder::new().span(span); + + let impl_item = match implement_interface(cx, &builder, &item, push) { + Ok(item) => item, + Err(Error) => { return; } + }; + + push(Annotatable::Item(impl_item)) +} + +fn field_name(builder: &aster::AstBuilder, arg: &Arg) -> ast::Ident { + match arg.pat.node { + PatKind::Ident(_, ref ident, _) => builder.id(ident.node), + _ => { panic!("unexpected param in interface: {:?}", arg.pat.node) } + } +} + +fn push_invoke_signature_aster( + builder: &aster::AstBuilder, + implement: &ImplItem, + signature: &MethodSig, + push: &mut FnMut(Annotatable), +) -> Dispatch { + + let inputs = &signature.decl.inputs; + let (input_type_name, input_arg_names) = if inputs.len() > 0 { + let first_field_name = field_name(builder, &inputs[0]).name.as_str(); + if first_field_name == "self" && inputs.len() == 1 { (None, vec![]) } + else { + let skip = if first_field_name == "self" { 2 } else { 1 }; + let name_str = format!("{}_input", implement.ident.name.as_str()); + + let mut arg_names = Vec::new(); + let arg_name = format!("{}", field_name(builder, &inputs[skip-1]).name); + let mut tree = builder.item() + .attr().word("derive(Serialize, Deserialize)") + .attr().word("allow(non_camel_case_types)") + .struct_(name_str.as_str()) + .field(arg_name.as_str()).ty().build(inputs[skip-1].ty.clone()); + arg_names.push(arg_name); + for arg in inputs.iter().skip(skip) { + let arg_name = format!("{}", field_name(builder, &arg)); + tree = tree.field(arg_name.as_str()).ty().build(arg.ty.clone()); + arg_names.push(arg_name); + } + + push(Annotatable::Item(tree.build())); + (Some(name_str.to_owned()), arg_names) + } + } + else { + (None, vec![]) + }; + + let return_type_name = match signature.decl.output { + FunctionRetTy::Ty(ref ty) => { + let name_str = format!("{}_output", implement.ident.name.as_str()); + let tree = builder.item() + .attr().word("derive(Serialize, Deserialize)") + .attr().word("allow(non_camel_case_types)") + .struct_(name_str.as_str()) + .field(format!("payload")).ty().build(ty.clone()); + push(Annotatable::Item(tree.build())); + Some(name_str.to_owned()) + } + _ => None + }; + + Dispatch { + function_name: format!("{}", implement.ident.name.as_str()), + input_type_name: input_type_name, + input_arg_names: input_arg_names, + return_type_name: return_type_name, + } +} + +struct Dispatch { + function_name: String, + input_type_name: Option, + input_arg_names: Vec, + return_type_name: Option, +} + +fn implement_dispatch_arm_invoke( + cx: &ExtCtxt, + builder: &aster::AstBuilder, + dispatch: &Dispatch, +) -> P +{ + let deserialize_expr = quote_expr!(cx, ::bincode::serde::deserialize_from(r, ::bincode::SizeLimit::Infinite).expect("ipc deserialization error, aborting")); + let input_type_id = builder.id(dispatch.input_type_name.clone().unwrap().as_str()); + let function_name = builder.id(dispatch.function_name.as_str()); + let output_type_id = builder.id(dispatch.return_type_name.clone().unwrap().as_str()); + + let input_args_exprs = dispatch.input_arg_names.iter().map(|ref arg_name| { + let arg_ident = builder.id(arg_name); + quote_expr!(cx, input. $arg_ident) + }).collect::>>(); + + // This is the expanded version of this: + // + // let invoke_serialize_stmt = quote_stmt!(cx, { + // ::bincode::serde::serialize(& $output_type_id { payload: self. $function_name ($hand_param_a, $hand_param_b) }, ::bincode::SizeLimit::Infinite).unwrap() + // }); + // + // But the above does not allow comma-separated expressions for arbitrary number + // of parameters ...$hand_param_a, $hand_param_b, ... $hand_param_n + let invoke_serialize_stmt = { + let ext_cx = &*cx; + ::quasi::parse_stmt_panic(&mut ::syntax::parse::new_parser_from_tts( + ext_cx.parse_sess(), + ext_cx.cfg(), + { + let _sp = ext_cx.call_site(); + let mut tt = ::std::vec::Vec::new(); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("bincode"), ::syntax::parse::token::ModName))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("serde"), ::syntax::parse::token::ModName))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("serialize"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); + tt.extend(::quasi::ToTokens::to_tokens(&output_type_id, ext_cx).into_iter()); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("payload"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Colon)); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Dot)); + tt.extend(::quasi::ToTokens::to_tokens(&function_name, ext_cx).into_iter()); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); + + for arg_expr in input_args_exprs { + tt.extend(::quasi::ToTokens::to_tokens(&arg_expr, ext_cx).into_iter()); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma)); + } + + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma)); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("bincode"), ::syntax::parse::token::ModName))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("SizeLimit"), ::syntax::parse::token::ModName))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Infinite"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Dot)); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("unwrap"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); + tt + })) + }; + quote_expr!(cx, { + let input: $input_type_id = $deserialize_expr; + $invoke_serialize_stmt + }) +} + +fn implement_dispatch_arm(cx: &ExtCtxt, builder: &aster::AstBuilder, index: u32, dispatch: &Dispatch) + -> ast::Arm +{ + let index_ident = builder.id(format!("{}", index).as_str()); + let invoke_expr = implement_dispatch_arm_invoke(cx, builder, dispatch); + quote_arm!(cx, $index_ident => { $invoke_expr } ) +} + +fn implement_interface( + cx: &ExtCtxt, + builder: &aster::AstBuilder, + item: &Item, + push: &mut FnMut(Annotatable), +) -> Result, Error> { + let (generics, impl_items) = match item.node { + ast::ItemKind::Impl(_, _, ref generics, _, _, ref impl_items) => (generics, impl_items), + _ => { + cx.span_err( + item.span, + "`#[derive(Ipc)]` may only be applied to item implementations"); + return Err(Error); + } + }; + + let impl_generics = builder.from_generics(generics.clone()) + .add_ty_param_bound( + builder.path().global().ids(&["ethcore_ipc"]).build() + ) + .build(); + + let ty = builder.ty().path() + .segment(item.ident).with_generics(impl_generics.clone()).build() + .build(); + + let where_clause = &impl_generics.where_clause; + + let mut dispatch_table = Vec::new(); + for impl_item in impl_items { + if let ImplItemKind::Method(ref signature, _) = impl_item.node { + dispatch_table.push(push_invoke_signature_aster(builder, &impl_item, signature, push)); + } + } + let mut index = -1; + let dispatch_arms: Vec<_> = dispatch_table.iter() + .map(|dispatch| { index = index + 1; implement_dispatch_arm(cx, builder, index as u32, dispatch) }).collect(); + + Ok(quote_item!(cx, + impl $impl_generics ::ipc::IpcInterface<$ty> for $ty $where_clause { + fn dispatch(&self, r: &mut R) -> Vec + where R: ::std::io::Read + { + let mut method_num = vec![0u8;2]; + match r.read(&mut method_num) { + Ok(size) if size == 0 => { panic!("method id not supplied" ); } + Err(e) => { panic!("ipc read error: {:?}, aborting", e); } + _ => { } + } + match method_num[0] as u16 + (method_num[1] as u16)*256 { + $dispatch_arms + _ => vec![] + } + } + fn invoke(&self, _method_num: u16, _payload: &Option>, _w: &mut W) + where W: ::std::io::Write + { + } + + } + ).unwrap()) +} diff --git a/ipc/codegen/src/lib.rs b/ipc/codegen/src/lib.rs new file mode 100644 index 000000000..44ac093d9 --- /dev/null +++ b/ipc/codegen/src/lib.rs @@ -0,0 +1,67 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! Codegen for IPC RPC + +#![cfg_attr(feature = "nightly-testing", plugin(clippy))] +#![cfg_attr(feature = "nightly-testing", feature(plugin))] +#![cfg_attr(feature = "nightly-testing", allow(used_underscore_binding))] +#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))] +#![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))] + +extern crate aster; +extern crate quasi; + +#[cfg(feature = "with-syntex")] +extern crate syntex; + +#[cfg(feature = "with-syntex")] +#[macro_use] +extern crate syntex_syntax as syntax; + +#[cfg(not(feature = "with-syntex"))] +#[macro_use] +extern crate syntax; + +#[cfg(not(feature = "with-syntex"))] +extern crate rustc_plugin; + +extern crate ethcore_ipc as ipc; + +#[cfg(not(feature = "with-syntex"))] +use syntax::feature_gate::AttributeType; + +#[cfg(feature = "with-syntex")] +include!(concat!(env!("OUT_DIR"), "/lib.rs")); + +#[cfg(not(feature = "with-syntex"))] +include!("lib.rs.in"); + +#[cfg(feature = "with-syntex")] +pub fn register(reg: &mut syntex::Registry) { + reg.add_attr("feature(custom_derive)"); + reg.add_attr("feature(custom_attribute)"); + + reg.add_decorator("derive_Ipc", codegen::expand_ipc_implementation); +} + +#[cfg(not(feature = "with-syntex"))] +pub fn register(reg: &mut rustc_plugin::Registry) { + reg.register_syntax_extension( + syntax::parse::token::intern("derive_Ipc"), + syntax::ext::base::MultiDecorator( + Box::new(ser::expand_derive_serialize))); +} diff --git a/ipc/codegen/src/lib.rs.in b/ipc/codegen/src/lib.rs.in new file mode 100644 index 000000000..c942157b1 --- /dev/null +++ b/ipc/codegen/src/lib.rs.in @@ -0,0 +1,17 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +mod codegen; diff --git a/ipc/rpc/Cargo.toml b/ipc/rpc/Cargo.toml new file mode 100644 index 000000000..b8a05f543 --- /dev/null +++ b/ipc/rpc/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "ethcore-ipc" +version = "1.1.0" +authors = ["Nikolay Volf "] +license = "GPL-3.0" + +[features] + +[dependencies] diff --git a/ipc/rpc/src/interface.rs b/ipc/rpc/src/interface.rs new file mode 100644 index 000000000..111176b1f --- /dev/null +++ b/ipc/rpc/src/interface.rs @@ -0,0 +1,24 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! IPC RPC interface + +pub trait IpcInterface { + /// reads the message from io, dispatches the call and returns result + fn dispatch(&self, r: &mut R) -> Vec where R: ::std::io::Read; + /// encodes the invocation, writes payload and waits for result + fn invoke(&self, method_num: u16, params: &Option>, w: &mut W) where W: ::std::io::Write; +} diff --git a/ipc/rpc/src/lib.rs b/ipc/rpc/src/lib.rs new file mode 100644 index 000000000..5018a5cd2 --- /dev/null +++ b/ipc/rpc/src/lib.rs @@ -0,0 +1,20 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! IPC RPC interface + +pub mod interface; +pub use interface::IpcInterface; diff --git a/ipc/tests/Cargo.toml b/ipc/tests/Cargo.toml new file mode 100644 index 000000000..a4d07ae57 --- /dev/null +++ b/ipc/tests/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "ethcore-ipc-tests" +version = "0.1.0" +authors = ["Nikolay Volf"] +build = "build.rs" + +[lib] +path = "run.rs" + +[dependencies] +"ethcore-ipc" = { path = "../rpc" } +bincode = "*" +serde = "0.7.0" + +[build-dependencies] +syntex = "0.30.0" +serde_codegen = "0.7.0" +"ethcore-ipc-codegen" = { path = "../codegen" } diff --git a/ipc/tests/build.rs b/ipc/tests/build.rs new file mode 100644 index 000000000..a960c4202 --- /dev/null +++ b/ipc/tests/build.rs @@ -0,0 +1,44 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +extern crate syntex; +extern crate ethcore_ipc_codegen as codegen; +extern crate serde_codegen; + +use std::env; +use std::path::Path; + +pub fn main() { + let out_dir = env::var_os("OUT_DIR").unwrap(); + + // ipc pass + { + let src = Path::new("service.rs.in"); + let dst = Path::new(&out_dir).join("service_ipc.rs"); + let mut registry = syntex::Registry::new(); + codegen::register(&mut registry); + registry.expand("", &src, &dst).unwrap(); + } + + // serde pass + { + let src = Path::new(&out_dir).join("service_ipc.rs"); + let dst = Path::new(&out_dir).join("service_cg.rs"); + let mut registry = syntex::Registry::new(); + serde_codegen::register(&mut registry); + registry.expand("", &src, &dst).unwrap(); + } +} diff --git a/ipc/tests/examples.rs b/ipc/tests/examples.rs new file mode 100644 index 000000000..5a6fc69bf --- /dev/null +++ b/ipc/tests/examples.rs @@ -0,0 +1,36 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +#[cfg(test)] +mod tests { + + use super::super::socket::*; + use super::super::service::*; + use ipc::*; + + #[test] + fn call_service() { + // method_num = 0, f = 10 (method Service::commit) + let mut socket = TestSocket::new_ready(vec![0, 0, 0, 0, 0, 10]); + + let service = Service::new(); + assert_eq!(0, *service.commits.read().unwrap()); + + service.dispatch(&mut socket); + + assert_eq!(10, *service.commits.read().unwrap()); + } +} diff --git a/ipc/tests/run.rs b/ipc/tests/run.rs new file mode 100644 index 000000000..187b52d9d --- /dev/null +++ b/ipc/tests/run.rs @@ -0,0 +1,23 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +extern crate bincode; +extern crate ethcore_ipc as ipc; +extern crate serde; + +pub mod socket; +pub mod service; +mod examples; diff --git a/ipc/tests/service.rs b/ipc/tests/service.rs new file mode 100644 index 000000000..ecd977f61 --- /dev/null +++ b/ipc/tests/service.rs @@ -0,0 +1,17 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +include!(concat!(env!("OUT_DIR"), "/service_cg.rs")); diff --git a/ipc/tests/service.rs.in b/ipc/tests/service.rs.in new file mode 100644 index 000000000..64b43c2ef --- /dev/null +++ b/ipc/tests/service.rs.in @@ -0,0 +1,45 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +use std::sync::RwLock; + +pub struct Service { + pub commits: RwLock, + pub rollbacks: RwLock, +} + +#[derive(Ipc)] +impl Service { + fn commit(&self, f: u32) -> u32 { + let mut lock = self.commits.write().unwrap(); + *lock = *lock + f as usize; + f + } + pub fn rollback(&self, a: u32, b: u32) -> i32 { + let mut lock = self.rollbacks.write().unwrap(); + *lock = *lock + a as usize - b as usize; + (a - b) as i32 + } +} + +impl Service { + pub fn new() -> Service { + Service { + commits: RwLock::new(0usize), + rollbacks: RwLock::new(0usize), + } + } +} diff --git a/ipc/tests/socket.rs b/ipc/tests/socket.rs new file mode 100644 index 000000000..c740e872a --- /dev/null +++ b/ipc/tests/socket.rs @@ -0,0 +1,94 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +use std::io::*; +use std::cmp; + +pub struct TestSocket { + pub read_buffer: Vec, + pub write_buffer: Vec, + pub cursor: usize, + pub buf_size: usize, +} + +impl Default for TestSocket { + fn default() -> Self { + TestSocket::new() + } +} + +impl TestSocket { + pub fn new() -> Self { + TestSocket { + read_buffer: vec![], + write_buffer: vec![], + cursor: 0, + buf_size: 0, + } + } + + pub fn new_buf(buf_size: usize) -> TestSocket { + TestSocket { + read_buffer: vec![], + write_buffer: vec![], + cursor: 0, + buf_size: buf_size, + } + } + + pub fn new_ready(data: Vec) -> TestSocket { + TestSocket { + read_buffer: data, + write_buffer: vec![], + cursor: 0, + buf_size: 0, + } + } +} + +impl Read for TestSocket { + fn read(&mut self, buf: &mut [u8]) -> Result { + let end_position = cmp::min(self.read_buffer.len(), self.cursor+buf.len()); + let len = cmp::max(end_position - self.cursor, 0); + match len { + 0 => Ok(0), + _ => { + for i in self.cursor..end_position { + buf[i-self.cursor] = self.read_buffer[i]; + } + self.cursor = self.cursor + buf.len(); + Ok(len) + } + } + } +} + +impl Write for TestSocket { + fn write(&mut self, buf: &[u8]) -> Result { + if self.buf_size == 0 || buf.len() < self.buf_size { + self.write_buffer.extend(buf.iter().cloned()); + Ok(buf.len()) + } + else { + self.write_buffer.extend(buf.iter().take(self.buf_size).cloned()); + Ok(self.buf_size) + } + } + + fn flush(&mut self) -> Result<()> { + unimplemented!(); + } +} diff --git a/json/src/blockchain/state.rs b/json/src/blockchain/state.rs index 51e77e95e..7779bd861 100644 --- a/json/src/blockchain/state.rs +++ b/json/src/blockchain/state.rs @@ -17,7 +17,6 @@ //! Blockchain test state deserializer. use std::collections::BTreeMap; -use std::ops::Deref; use hash::Address; use blockchain::account::Account; @@ -25,10 +24,11 @@ use blockchain::account::Account; #[derive(Debug, PartialEq, Deserialize, Clone)] pub struct State(pub BTreeMap); -impl Deref for State { - type Target = BTreeMap; +impl IntoIterator for State { + type Item = as IntoIterator>::Item; + type IntoIter = as IntoIterator>::IntoIter; - fn deref(&self) -> &Self::Target { - &self.0 + fn into_iter(self) -> Self::IntoIter { + self.0.into_iter() } } diff --git a/json/src/blockchain/test.rs b/json/src/blockchain/test.rs index 1a6a63a71..301d921df 100644 --- a/json/src/blockchain/test.rs +++ b/json/src/blockchain/test.rs @@ -17,7 +17,6 @@ //! Blockchain test deserializer. use std::collections::BTreeMap; -use std::ops::Deref; use std::io::Read; use serde_json; use serde_json::Error; @@ -27,11 +26,12 @@ use blockchain::blockchain::BlockChain; #[derive(Debug, PartialEq, Deserialize)] pub struct Test(BTreeMap); -impl Deref for Test { - type Target = BTreeMap; +impl IntoIterator for Test { + type Item = as IntoIterator>::Item; + type IntoIter = as IntoIterator>::IntoIter; - fn deref(&self) -> &Self::Target { - &self.0 + fn into_iter(self) -> Self::IntoIter { + self.0.into_iter() } } diff --git a/json/src/hash.rs b/json/src/hash.rs index c555b6266..ad546fcab 100644 --- a/json/src/hash.rs +++ b/json/src/hash.rs @@ -26,7 +26,7 @@ macro_rules! impl_hash { ($name: ident, $inner: ident) => { /// Lenient hash json deserialization for test json files. #[derive(Default, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone)] - pub struct $name($inner); + pub struct $name(pub $inner); impl Into<$inner> for $name { fn into(self) -> $inner { diff --git a/json/src/lib.rs.in b/json/src/lib.rs.in index 0d85ce569..aff685cb7 100644 --- a/json/src/lib.rs.in +++ b/json/src/lib.rs.in @@ -24,3 +24,5 @@ pub mod uint; pub mod bytes; pub mod blockchain; pub mod spec; +pub mod vm; +pub mod maybe; diff --git a/json/src/maybe.rs b/json/src/maybe.rs new file mode 100644 index 000000000..dd4d5d821 --- /dev/null +++ b/json/src/maybe.rs @@ -0,0 +1,83 @@ + +//! Deserializer of empty string values into optionals. + +use std::marker::PhantomData; +use serde::{Deserialize, Deserializer, Error}; +use serde::de::Visitor; +use serde_json::Value; +use serde_json::value; + +/// Deserializer of empty string values into optionals. +#[derive(Debug, PartialEq)] +pub enum MaybeEmpty { + /// Some. + Some(T), + /// None. + None, +} + +impl Deserialize for MaybeEmpty where T: Deserialize { + fn deserialize(deserializer: &mut D) -> Result + where D: Deserializer { + deserializer.deserialize(MaybeEmptyVisitor::new()) + } +} + +struct MaybeEmptyVisitor { + _phantom: PhantomData +} + +impl MaybeEmptyVisitor { + fn new() -> Self { + MaybeEmptyVisitor { + _phantom: PhantomData + } + } +} + +impl Visitor for MaybeEmptyVisitor where T: Deserialize { + type Value = MaybeEmpty; + + fn visit_str(&mut self, value: &str) -> Result where E: Error { + self.visit_string(value.to_owned()) + } + + fn visit_string(&mut self, value: String) -> Result where E: Error { + match value.is_empty() { + true => Ok(MaybeEmpty::None), + false => { + let value = Value::String(value); + T::deserialize(&mut value::Deserializer::new(value)).map(MaybeEmpty::Some).map_err(|_| Error::custom("failed")) + } + } + } +} + +impl Into> for MaybeEmpty { + fn into(self) -> Option { + match self { + MaybeEmpty::Some(s) => Some(s), + MaybeEmpty::None => None + } + } +} + +#[cfg(test)] +mod tests { + use std::str::FromStr; + use serde_json; + use util::hash; + use hash::H256; + use maybe::MaybeEmpty; + + #[test] + fn maybe_deserialization() { + let s = r#"["", "5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae"]"#; + let deserialized: Vec> = serde_json::from_str(s).unwrap(); + assert_eq!(deserialized, vec![ + MaybeEmpty::None, + MaybeEmpty::Some(H256(hash::H256::from_str("5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae").unwrap())) + ]); + } + +} diff --git a/json/src/vm/call.rs b/json/src/vm/call.rs new file mode 100644 index 000000000..2fe6265aa --- /dev/null +++ b/json/src/vm/call.rs @@ -0,0 +1,54 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! Vm call deserialization. + +use bytes::Bytes; +use hash::Address; +use uint::Uint; +use maybe::MaybeEmpty; + +/// Vm call deserialization. +#[derive(Debug, PartialEq, Deserialize)] +pub struct Call { + /// Call data. + pub data: Bytes, + /// Call destination. + pub destination: MaybeEmpty
, + /// Gas limit. + #[serde(rename="gasLimit")] + pub gas_limit: Uint, + /// Call value. + pub value: Uint, +} + +#[cfg(test)] +mod tests { + use serde_json; + use vm::Call; + + #[test] + fn call_deserialization() { + let s = r#"{ + "data" : "0x1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff", + "destination" : "", + "gasLimit" : "0x1748766aa5", + "value" : "0x00" + }"#; + let _deserialized: Call = serde_json::from_str(s).unwrap(); + // TODO: validate all fields + } +} diff --git a/json/src/vm/env.rs b/json/src/vm/env.rs new file mode 100644 index 000000000..95365c0a8 --- /dev/null +++ b/json/src/vm/env.rs @@ -0,0 +1,58 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! Vm environment. +use hash::Address; +use uint::Uint; + +/// Vm environment. +#[derive(Debug, PartialEq, Deserialize)] +pub struct Env { + /// Address. + #[serde(rename="currentCoinbase")] + pub author: Address, + /// Difficulty + #[serde(rename="currentDifficulty")] + pub difficulty: Uint, + /// Gas limit. + #[serde(rename="currentGasLimit")] + pub gas_limit: Uint, + /// Number. + #[serde(rename="currentNumber")] + pub number: Uint, + /// Timestamp. + #[serde(rename="currentTimestamp")] + pub timestamp: Uint, +} + +#[cfg(test)] +mod tests { + use serde_json; + use vm::Env; + + #[test] + fn env_deserialization() { + let s = r#"{ + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x0100", + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x00", + "currentTimestamp" : "0x01" + }"#; + let _deserialized: Env = serde_json::from_str(s).unwrap(); + // TODO: validate all fields + } +} diff --git a/json/src/vm/log.rs b/json/src/vm/log.rs new file mode 100644 index 000000000..b29325738 --- /dev/null +++ b/json/src/vm/log.rs @@ -0,0 +1,54 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! Vm log deserialization. + +use hash::{Address, H256, Bloom}; +use bytes::Bytes; + +/// Vm log deserialization. +#[derive(Debug, PartialEq, Deserialize)] +pub struct Log { + /// Log address. + pub address: Address, + /// Log bloom. + pub bloom: Bloom, + /// Data. + pub data: Bytes, + /// Topics. + pub topics: Vec, +} + +#[cfg(test)] +mod tests { + use serde_json; + use vm::Log; + + #[test] + fn log_deserialization() { + let s = r#"{ + "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000", + "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd", + "topics" : [ + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + ] + }"#; + let _deserialized: Log = serde_json::from_str(s).unwrap(); + // TODO: validate all fields + } +} + diff --git a/json/src/vm/mod.rs b/json/src/vm/mod.rs new file mode 100644 index 000000000..ecc0d05a4 --- /dev/null +++ b/json/src/vm/mod.rs @@ -0,0 +1,31 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! Vm test loader. + +pub mod env; +pub mod transaction; +pub mod vm; +pub mod log; +pub mod call; +pub mod test; + +pub use self::env::Env; +pub use self::transaction::Transaction; +pub use self::vm::Vm; +pub use self::log::Log; +pub use self::call::Call; +pub use self::test::Test; diff --git a/json/src/vm/test.rs b/json/src/vm/test.rs new file mode 100644 index 000000000..e348826e1 --- /dev/null +++ b/json/src/vm/test.rs @@ -0,0 +1,43 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! Vm test deserializer. + +use std::collections::BTreeMap; +use std::io::Read; +use serde_json; +use serde_json::Error; +use vm::Vm; + +/// Vm test deserializer. +#[derive(Debug, PartialEq, Deserialize)] +pub struct Test(BTreeMap); + +impl IntoIterator for Test { + type Item = as IntoIterator>::Item; + type IntoIter = as IntoIterator>::IntoIter; + + fn into_iter(self) -> Self::IntoIter { + self.0.into_iter() + } +} + +impl Test { + /// Loads test from json. + pub fn load(reader: R) -> Result where R: Read { + serde_json::from_reader(reader) + } +} diff --git a/json/src/vm/transaction.rs b/json/src/vm/transaction.rs new file mode 100644 index 000000000..d2ee8b89b --- /dev/null +++ b/json/src/vm/transaction.rs @@ -0,0 +1,64 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! Executed transaction. +use hash::Address; +use uint::Uint; +use bytes::Bytes; + +/// Executed transaction. +#[derive(Debug, PartialEq, Deserialize)] +pub struct Transaction { + /// Contract address. + pub address: Address, + /// Transaction sender. + #[serde(rename="caller")] + pub sender: Address, + /// Contract code. + pub code: Bytes, + /// Input data. + pub data: Bytes, + /// Gas. + pub gas: Uint, + /// Gas price. + #[serde(rename="gasPrice")] + pub gas_price: Uint, + /// Transaction origin. + pub origin: Address, + /// Sent value. + pub value: Uint, +} + +#[cfg(test)] +mod tests { + use serde_json; + use vm::Transaction; + + #[test] + fn transaction_deserialization() { + let s = r#"{ + "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01600055", + "data" : "0x", + "gas" : "0x0186a0", + "gasPrice" : "0x5af3107a4000", + "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681", + "value" : "0x0de0b6b3a7640000" + }"#; + let _deserialized: Transaction = serde_json::from_str(s).unwrap(); + } +} diff --git a/json/src/vm/vm.rs b/json/src/vm/vm.rs new file mode 100644 index 000000000..b0a7c2a4b --- /dev/null +++ b/json/src/vm/vm.rs @@ -0,0 +1,112 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! Vm execution env. + +use bytes::Bytes; +use uint::Uint; +use blockchain::State; +use vm::{Transaction, Log, Call, Env}; + +/// Reporesents vm execution environment before and after exeuction of transaction. +#[derive(Debug, PartialEq, Deserialize)] +pub struct Vm { + /// Contract calls made internaly by executed transaction. + #[serde(rename="callcreates")] + pub calls: Option>, + /// Env info. + pub env: Env, + /// Executed transaction + #[serde(rename="exec")] + pub transaction: Transaction, + /// Gas left after transaction execution. + #[serde(rename="gas")] + pub gas_left: Option, + /// Logs created during execution of transaction. + pub logs: Option>, + /// Transaction output. + #[serde(rename="out")] + pub output: Option, + /// Post execution vm state. + #[serde(rename="post")] + pub post_state: Option, + /// Pre execution vm state. + #[serde(rename="pre")] + pub pre_state: State, +} + +impl Vm { + /// Returns true if transaction execution run out of gas. + pub fn out_of_gas(&self) -> bool { + self.calls.is_none() + } +} + +#[cfg(test)] +mod tests { + use serde_json; + use vm::Vm; + + #[test] + fn vm_deserialization() { + let s = r#"{ + "callcreates" : [ + ], + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x0100", + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x00", + "currentTimestamp" : "0x01" + }, + "exec" : { + "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01600055", + "data" : "0x", + "gas" : "0x0186a0", + "gasPrice" : "0x5af3107a4000", + "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681", + "value" : "0x0de0b6b3a7640000" + }, + "gas" : "0x013874", + "logs" : [ + ], + "out" : "0x", + "post" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01600055", + "nonce" : "0x00", + "storage" : { + "0x00" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" + } + } + }, + "pre" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01600055", + "nonce" : "0x00", + "storage" : { + } + } + } + }"#; + let _deserialized: Vm = serde_json::from_str(s).unwrap(); + // TODO: validate all fields + } +} diff --git a/rpc/src/v1/impls/net.rs b/rpc/src/v1/impls/net.rs index e52fc0bd4..fb502e6cf 100644 --- a/rpc/src/v1/impls/net.rs +++ b/rpc/src/v1/impls/net.rs @@ -36,7 +36,7 @@ impl NetClient where S: SyncProvider { impl Net for NetClient where S: SyncProvider + 'static { fn version(&self, _: Params) -> Result { - Ok(Value::String(format!("{}", take_weak!(self.sync).status().protocol_version).to_owned())) + Ok(Value::String(format!("{}", take_weak!(self.sync).status().network_id).to_owned())) } fn peer_count(&self, _params: Params) -> Result { diff --git a/rpc/src/v1/impls/web3.rs b/rpc/src/v1/impls/web3.rs index 64a82adb9..87343a18a 100644 --- a/rpc/src/v1/impls/web3.rs +++ b/rpc/src/v1/impls/web3.rs @@ -18,6 +18,8 @@ use jsonrpc_core::*; use util::version; use v1::traits::Web3; +use v1::types::Bytes; +use util::sha3::Hashable; /// Web3 rpc implementation. pub struct Web3Client; @@ -34,4 +36,14 @@ impl Web3 for Web3Client { _ => Err(Error::invalid_params()) } } + + fn sha3(&self, params: Params) -> Result { + from_params::<(Bytes,)>(params).and_then( + |(data,)| { + let Bytes(ref v) = data; + let sha3 = v.sha3(); + to_value(&sha3) + } + ) + } } diff --git a/rpc/src/v1/tests/eth.rs b/rpc/src/v1/tests/eth.rs index 209b95ded..182f6c368 100644 --- a/rpc/src/v1/tests/eth.rs +++ b/rpc/src/v1/tests/eth.rs @@ -40,7 +40,7 @@ fn accounts_provider() -> Arc { fn sync_provider() -> Arc { Arc::new(TestSyncProvider::new(Config { - protocol_version: 65, + network_id: U256::from(3), num_peers: 120, })) } @@ -83,7 +83,7 @@ impl Default for EthTester { #[test] fn rpc_eth_protocol_version() { let request = r#"{"jsonrpc": "2.0", "method": "eth_protocolVersion", "params": [], "id": 1}"#; - let response = r#"{"jsonrpc":"2.0","result":"65","id":1}"#; + let response = r#"{"jsonrpc":"2.0","result":"63","id":1}"#; assert_eq!(EthTester::default().io.handle_request(request), Some(response.to_owned())); } diff --git a/rpc/src/v1/tests/helpers/sync_provider.rs b/rpc/src/v1/tests/helpers/sync_provider.rs index 48b4f55a9..527974140 100644 --- a/rpc/src/v1/tests/helpers/sync_provider.rs +++ b/rpc/src/v1/tests/helpers/sync_provider.rs @@ -16,13 +16,14 @@ //! Test implementation of SyncProvider. +use util::U256; use ethsync::{SyncProvider, SyncStatus, SyncState}; use std::sync::{RwLock}; /// TestSyncProvider config. pub struct Config { /// Protocol version. - pub protocol_version: u8, + pub network_id: U256, /// Number of peers. pub num_peers: usize, } @@ -39,7 +40,8 @@ impl TestSyncProvider { TestSyncProvider { status: RwLock::new(SyncStatus { state: SyncState::NotSynced, - protocol_version: config.protocol_version, + network_id: config.network_id, + protocol_version: 63, start_block_number: 0, last_imported_block_number: None, highest_block_number: None, diff --git a/rpc/src/v1/tests/net.rs b/rpc/src/v1/tests/net.rs index e24045ca6..036ced168 100644 --- a/rpc/src/v1/tests/net.rs +++ b/rpc/src/v1/tests/net.rs @@ -18,10 +18,11 @@ use std::sync::Arc; use jsonrpc_core::IoHandler; use v1::{Net, NetClient}; use v1::tests::helpers::{Config, TestSyncProvider}; +use util::numbers::*; fn sync_provider() -> Arc { Arc::new(TestSyncProvider::new(Config { - protocol_version: 65, + network_id: U256::from(3), num_peers: 120, })) } @@ -34,7 +35,7 @@ fn rpc_net_version() { io.add_delegate(net); let request = r#"{"jsonrpc": "2.0", "method": "net_version", "params": [], "id": 1}"#; - let response = r#"{"jsonrpc":"2.0","result":"65","id":1}"#; + let response = r#"{"jsonrpc":"2.0","result":"3","id":1}"#; assert_eq!(io.handle_request(request), Some(response.to_owned())); } diff --git a/rpc/src/v1/tests/web3.rs b/rpc/src/v1/tests/web3.rs index c717d361a..178dddfd7 100644 --- a/rpc/src/v1/tests/web3.rs +++ b/rpc/src/v1/tests/web3.rs @@ -31,3 +31,31 @@ fn rpc_web3_version() { assert_eq!(io.handle_request(request), Some(response)); } + +#[test] +fn rpc_web3_sha3() { + let web3 = Web3Client::new().to_delegate(); + let io = IoHandler::new(); + io.add_delegate(web3); + + let v = version().to_owned().replace("Parity/", "Parity//"); + + let request = r#"{"jsonrpc": "2.0", "method": "web3_sha3", "params": ["0x00"], "id": 1}"#; + let response = r#"{"jsonrpc":"2.0","result":"0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a","id":1}"#; + + assert_eq!(io.handle_request(request), Some(response.to_owned())); +} + +#[test] +fn rpc_web3_sha3_wiki() { + let web3 = Web3Client::new().to_delegate(); + let io = IoHandler::new(); + io.add_delegate(web3); + + let v = version().to_owned().replace("Parity/", "Parity//"); + + let request = r#"{"jsonrpc": "2.0", "method": "web3_sha3", "params": ["0x68656c6c6f20776f726c64"], "id": 1}"#; + let response = r#"{"jsonrpc":"2.0","result":"0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad","id":1}"#; + + assert_eq!(io.handle_request(request), Some(response.to_owned())); +} diff --git a/rpc/src/v1/traits/web3.rs b/rpc/src/v1/traits/web3.rs index bb8653504..c7b21a1a1 100644 --- a/rpc/src/v1/traits/web3.rs +++ b/rpc/src/v1/traits/web3.rs @@ -23,10 +23,14 @@ pub trait Web3: Sized + Send + Sync + 'static { /// Returns current client version. fn client_version(&self, _: Params) -> Result { rpc_unimplemented!() } + /// Returns sha3 of the given data + fn sha3(&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("web3_clientVersion", Web3::client_version); + delegate.add_method("web3_sha3", Web3::sha3); delegate } } diff --git a/rpc/src/v1/types/bytes.rs b/rpc/src/v1/types/bytes.rs index 8c47806f8..efae15ef6 100644 --- a/rpc/src/v1/types/bytes.rs +++ b/rpc/src/v1/types/bytes.rs @@ -21,7 +21,7 @@ use util::common::FromHex; /// Wrapper structure around vector of bytes. #[derive(Debug, PartialEq, Default)] -pub struct Bytes(Vec); +pub struct Bytes(pub Vec); impl Bytes { /// Simple constructor. diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 000000000..0b377a371 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,14 @@ +verbose=false +max_width=150 +ideal_width=120 +tabs_spaces=4 +fn_call_width=100 +single_line_if_else=true +where_indent="Visual" +where_trailing_comma=true +chain_base_indent="Inherit" +chain_indent="Tabbed" +reorder_imports=true +format_strings=false +hard_tabs=true +wrap_match_arms=false diff --git a/sync/src/chain.rs b/sync/src/chain.rs index 4fd386333..41afbea1c 100644 --- a/sync/src/chain.rs +++ b/sync/src/chain.rs @@ -125,6 +125,8 @@ pub struct SyncStatus { pub state: SyncState, /// Syncing protocol version. That's the maximum protocol version we connect to. pub protocol_version: u8, + /// The underlying p2p network version. + pub network_id: U256, /// BlockChain height for the moment the sync started. pub start_block_number: BlockNumber, /// Last fully downloaded and imported block number (if any). @@ -249,6 +251,7 @@ impl ChainSync { SyncStatus { state: self.state.clone(), protocol_version: 63, + network_id: self.network_id, start_block_number: self.starting_block, last_imported_block_number: self.last_imported_block, highest_block_number: self.highest_block, diff --git a/util/.travis.yml b/util/.travis.yml deleted file mode 100644 index eedbcaaad..000000000 --- a/util/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -language: rust - -rust: - - beta - -os: - #- linux - - osx - -before_script: - # g++4.8 for C++11 which is required by rocksdb - #- if [ $TRAVIS_OS_NAME == "linux" ]; then - #sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - #sudo apt-get update -y -qq - #sudo apt-get install -qq --yes --force-yes g++-4.8 - #sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50 - - #wget https://github.com/facebook/rocksdb/archive/rocksdb-3.13.tar.gz - #tar xvf rocksdb-3.13.tar.gz && cd rocksdb-rocksdb-3.13 && make shared_lib - #sudo make install - #cd .. - #else - - brew update - - brew install rocksdb - #fi - -after_success: - #- if [ $TRAVIS_OS_NAME == "linux" ]; then - #sudo apt-get install libcurl4-openssl-dev libelf-dev libdw-dev - #wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz - #tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && sudo make install && cd ../.. && - #kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov target/debug/ethcore_util-* - #fi diff --git a/util/LICENSE b/util/LICENSE deleted file mode 100644 index 733c07236..000000000 --- a/util/LICENSE +++ /dev/null @@ -1,675 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. - diff --git a/util/README.md b/util/README.md deleted file mode 100644 index 744d98922..000000000 --- a/util/README.md +++ /dev/null @@ -1 +0,0 @@ -# ethcore-util diff --git a/util/rustfmt.toml b/util/rustfmt.toml deleted file mode 100644 index 218e20321..000000000 --- a/util/rustfmt.toml +++ /dev/null @@ -1 +0,0 @@ -hard_tabs = true diff --git a/util/src/crypto.rs b/util/src/crypto.rs index e5096a317..e9b3116fd 100644 --- a/util/src/crypto.rs +++ b/util/src/crypto.rs @@ -208,7 +208,7 @@ pub mod ec { match context.verify(&try!(Message::from_slice(&message)), &sig, &publ) { Ok(_) => Ok(true), Err(Error::IncorrectSignature) => Ok(false), - Err(x) => Err(>::from(x)) + Err(x) => Err(CryptoError::from(x)) } } diff --git a/util/src/rlp/rlpin.rs b/util/src/rlp/rlpin.rs index 9d3fcb2fa..945ae9b24 100644 --- a/util/src/rlp/rlpin.rs +++ b/util/src/rlp/rlpin.rs @@ -153,7 +153,7 @@ impl<'a, 'view> Iterator for RlpIterator<'a, 'view> { fn next(&mut self) -> Option> { let index = self.index; - let result = self.rlp.rlp.at(index).ok().map(| iter | { From::from(iter) }); + let result = self.rlp.rlp.at(index).ok().map(From::from); self.index += 1; result }