Fredrik
|
e54784bfeb
|
Merge branch 'master' into fo-6418-dont-export-bigint
# Conflicts:
# dapps/src/tests/helpers/registrar.rs
# ethcore/evm/src/interpreter/shared_cache.rs
# ethcore/light/src/client/header_chain.rs
# ethcore/light/src/client/mod.rs
# ethcore/light/src/net/mod.rs
# ethcore/light/src/on_demand/request.rs
# ethcore/light/src/on_demand/tests.rs
# ethcore/light/src/provider.rs
# ethcore/node_filter/src/lib.rs
# ethcore/src/block.rs
# ethcore/src/blockchain/blockchain.rs
# ethcore/src/client/test_client.rs
# ethcore/src/engines/authority_round/mod.rs
# ethcore/src/engines/basic_authority.rs
# ethcore/src/engines/mod.rs
# ethcore/src/engines/tendermint/mod.rs
# ethcore/src/engines/validator_set/contract.rs
# ethcore/src/engines/validator_set/multi.rs
# ethcore/src/engines/validator_set/safe_contract.rs
# ethcore/src/engines/vote_collector.rs
# ethcore/src/miner/external.rs
# ethcore/src/miner/miner.rs
# ethcore/src/miner/service_transaction_checker.rs
# ethcore/src/miner/work_notify.rs
# ethcore/src/pod_account.rs
# ethcore/src/pod_state.rs
# ethcore/src/snapshot/block.rs
# ethcore/src/snapshot/consensus/work.rs
# ethcore/src/snapshot/mod.rs
# ethcore/src/snapshot/service.rs
# ethcore/src/spec/spec.rs
# ethcore/src/state/backend.rs
# ethcore/src/trace/db.rs
# ethcore/src/verification/queue/mod.rs
# ethcore/src/verification/verification.rs
# parity/informant.rs
# rpc/src/v1/helpers/dispatch.rs
# rpc/src/v1/helpers/light_fetch.rs
# rpc/src/v1/helpers/signing_queue.rs
# rpc/src/v1/impls/eth.rs
# rpc/src/v1/impls/eth_filter.rs
# rpc/src/v1/impls/eth_pubsub.rs
# rpc/src/v1/impls/light/eth.rs
# rpc/src/v1/impls/signing.rs
# rpc/src/v1/tests/helpers/miner_service.rs
# rpc/src/v1/tests/helpers/snapshot_service.rs
# rpc/src/v1/tests/helpers/sync_provider.rs
# rpc/src/v1/tests/mocked/eth.rs
# stratum/src/lib.rs
# sync/src/blocks.rs
# sync/src/chain.rs
# sync/src/light_sync/mod.rs
# sync/src/tests/helpers.rs
# sync/src/tests/snapshot.rs
# updater/src/updater.rs
# util/src/lib.rs
# util/triehash/src/lib.rs
|
2017-09-04 18:32:55 +02:00 |
|
Fredrik
|
308f36a532
|
Don't reexport bigint from util
|
2017-09-04 16:36:49 +02:00 |
|
Hawstein
|
7b8af30590
|
remove re-export of parking_lot in util (#6435)
|
2017-09-02 20:09:13 +02:00 |
|
Gav Wood
|
8404edb656
|
Fix whitespace (#4299)
* Fix whitespace.
* Update copyright years/owner.
* Push release only for tags.
|
2017-01-25 18:51:41 +01:00 |
|
Gav Wood
|
17cc2be4b5
|
Rename ethcore -> parity in license.
|
2016-12-11 19:30:54 +01:00 |
|
Gav Wood
|
9de579366a
|
Miner tweaks (#1797)
* Mining fixes.
- Use queue to determine whether we're mining
- Kick stale hash rates
Fixes #1794
Fixes #1641
* Fix tests.
* Address grumbles.
|
2016-08-02 17:53:32 +01:00 |
|
Robert Habermeier
|
36d3d0d7d7
|
replace synchronization primitives with those from parking_lot (#1593)
* parking_lot in cargo.toml
* replace all lock invocations with parking_lot ones
* use parking_lot synchronization primitives
|
2016-07-13 19:59:59 +02:00 |
|
Gav Wood
|
3b662c285f
|
Switch out .X().unwrap() for .unwrapped_X
|
2016-07-07 09:37:31 +02:00 |
|
Nikolay Volf
|
8e252d5f1b
|
refactored to merge client & client
|
2016-05-31 19:52:53 +02:00 |
|