Merge branch 'master' into updating_clippy
Conflicts: ethcore/src/lib.rs sync/src/chain.rs sync/src/lib.rs util/src/keys/store.rs util/src/lib.rs
Showing
- Cargo.lock 0 additions, 3 deletionsCargo.lock
- Cargo.toml 6 additions, 9 deletionsCargo.toml
- README.md 0 additions, 3 deletionsREADME.md
- cargo.sh 0 additions, 2 deletionscargo.sh
- ethcore/Cargo.toml 1 addition, 5 deletionsethcore/Cargo.toml
- ethcore/src/basic_types.rs 1 addition, 1 deletionethcore/src/basic_types.rs
- ethcore/src/block.rs 12 additions, 12 deletionsethcore/src/block.rs
- ethcore/src/block_queue.rs 101 additions, 80 deletionsethcore/src/block_queue.rs
- ethcore/src/blockchain/blockchain.rs 62 additions, 46 deletionsethcore/src/blockchain/blockchain.rs
- ethcore/src/blockchain/mod.rs 1 addition, 1 deletionethcore/src/blockchain/mod.rs
- ethcore/src/client/client.rs 69 additions, 208 deletionsethcore/src/client/client.rs
- ethcore/src/client/config.rs 14 additions, 7 deletionsethcore/src/client/config.rs
- ethcore/src/client/ids.rs 44 additions, 0 deletionsethcore/src/client/ids.rs
- ethcore/src/client/mod.rs 113 additions, 0 deletionsethcore/src/client/mod.rs
- ethcore/src/client/test_client.rs 336 additions, 0 deletionsethcore/src/client/test_client.rs
- ethcore/src/ethereum/ethash.rs 3 additions, 3 deletionsethcore/src/ethereum/ethash.rs
- ethcore/src/ethereum/mod.rs 1 addition, 1 deletionethcore/src/ethereum/mod.rs
- ethcore/src/evm/interpreter.rs 3 additions, 3 deletionsethcore/src/evm/interpreter.rs
- ethcore/src/externalities.rs 1 addition, 1 deletionethcore/src/externalities.rs
- ethcore/src/lib.rs 7 additions, 7 deletionsethcore/src/lib.rs
Please register or sign in to comment