Commit Graph

53 Commits

Author SHA1 Message Date
Tomasz Drwięga 4cf18c728d Fixing sync invalid sync test 2016-03-13 20:53:47 +01:00
Gav Wood 08b9cc2c41 Merge changes from #674 into branch. 2016-03-13 15:29:55 +01:00
Gav Wood e7574d4516 Update lib.rs 2016-03-12 19:29:18 +01:00
Tomasz Drwięga aebc91d96f Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml
2016-03-12 09:50:18 +01:00
Tomasz Drwięga f724cab92d 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
2016-03-11 19:17:09 +01:00
Nikolay Volf eaf22198e2 Merge pull request #676 from ethcore/fix-tx-warnings
fix warning for transaction_queue.add usage
2016-03-11 19:48:05 +03:00
Tomasz Drwięga 03da6c991f Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.lock
	Cargo.toml
	ethcore/src/client/client.rs
	hook.sh
	parity/main.rs
	rpc/Cargo.toml
	rpc/src/v1/impls/eth.rs
	sync/Cargo.toml
	sync/src/tests/helpers.rs
2016-03-11 14:37:07 +01:00
Nikolay Volf 99c5794929 fix warning for transaction_queue.add usage 2016-03-11 16:00:30 +04:00
Tomasz Drwięga d84e008e00 Removing superflous check for nightly 2016-03-11 11:16:49 +01:00
Tomasz Drwięga 8709dd28f8 Fixing clippy warnings 2016-03-11 10:58:51 +01:00
Tomasz Drwięga 5b204a5ff5 Merge branch 'master' into ethminer_crate
Conflicts:
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/lib.rs
2016-03-11 10:31:07 +01:00
Tomasz Drwięga 3bbdc03d0c Fixing doctest. 2016-03-11 10:17:51 +01:00
Nikolay Volf 25a63611f8 extend sync status interface to sync provider 2016-03-10 20:32:17 +04:00
Tomasz Drwięga 92022ac14d Merge branch 'master' into ethminer_crate
Conflicts:
	ethcore/src/client.rs
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/chain.rs
2016-03-10 16:38:58 +01:00
Gav Wood 8dd41bfe0c Merge pull request #641 from ethcore/jsonrpc_interfaces
jsonrpc uses client and sync interfaces
2016-03-10 15:44:05 +01:00
Gav Wood 5764ec5ddc Merge pull request #609 from ethcore/tx-rpc-expose
Expose transaction insertion in sync lib
2016-03-10 15:28:43 +01:00
Tomasz Drwięga 2e72173620 Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.lock
	Cargo.toml
	hook.sh
	miner/src/transaction_queue.rs
	rpc/Cargo.toml
	sync/Cargo.toml
	sync/src/chain.rs
2016-03-10 12:25:36 +01:00
Tomasz Drwięga d4e7eafede Merge branch 'master' into tx_queue_integration
Conflicts:
	sync/src/transaction_queue.rs
2016-03-10 11:23:39 +01:00
Gav Wood 249a89fc2d Merge pull request #627 from ethcore/clippy-dev
`dev` feature enabled when compiling without `--release`
2016-03-10 11:05:56 +01:00
Nikolay Volf a2046b429f exposing only one func 2016-03-10 13:27:33 +04:00
Nikolay Volf ddc3440712 Merge branch 'master' into tx-rpc-expose
Conflicts:
	sync/src/chain.rs
2016-03-10 03:22:32 +04:00
debris 082a4d9078 jsonrpc uses client and sync interfaces as a preparetion for jsonrpc tests 2016-03-09 17:31:43 +01:00
Tomasz Drwięga 363de973c9 Adding documentation and ditching EthMiner 2016-03-09 14:26:28 +01:00
Tomasz Drwięga 5db84c3233 Adding transactions to block 2016-03-09 13:09:34 +01:00
Tomasz Drwięga 99a6802b61 Moving block sealing and transaction_queue to separate create 2016-03-08 15:46:44 +01:00
Tomasz Drwięga 655bb0ed5d Additional documentation for transaction queue 2016-03-08 12:36:06 +01:00
Tomasz Drwięga cbc2c0cf0c Fixing clippy warnings. When building on nightly it is required to enable clippy 2016-03-07 14:34:17 +01:00
Tomasz Drwięga e83f856104 Merging chain_blocks_verified to chain_new_blocks 2016-03-07 12:16:37 +01:00
Tomasz Drwięga e91de78528 Renaming back bad as retracted 2016-03-06 11:12:02 +01:00
Nikolay Volf ad81356683 fix namespace 2016-03-06 00:48:00 +03:00
Nikolay Volf e100ecbeac exposing in lib 2016-03-05 23:47:28 +03:00
Tomasz Drwięga cc3839ae57 Revert "Revert "Transaction Queue integration""
This reverts commit d330f0b7b7.

Conflicts:
	sync/src/transaction_queue.rs
2016-03-05 16:46:04 +01:00
Gav Wood d330f0b7b7 Revert "Transaction Queue integration" 2016-03-05 12:53:54 +01:00
Tomasz Drwięga b9a6a70ced Renaming bad blocks as retracted 2016-03-05 11:37:19 +01:00
Tomasz Drwięga 7565625ce0 Integrating TransactionQueue with client 2016-03-01 22:30:23 +01:00
Tomasz Drwięga 725e894f9b TransactionsQueue implementation 2016-03-01 21:48:58 +01:00
arkpar bed89d0740 Fixed sync tests 2016-02-25 16:32:34 +01:00
arkpar 1a73d70334 Report memory usage 2016-02-24 22:37:28 +01:00
arkpar cb3608c6d3 Limit download ahead 2016-02-24 21:23:58 +01:00
debris b5d6359030 fixed allow warnings in ethcore 2016-02-19 12:40:23 +01:00
debris c0aca706d2 removed commented out line 2016-02-19 00:51:17 +01:00
debris 19a3daf533 parity compiling fine 2016-02-19 00:50:23 +01:00
Manish Goregaokar 8802fb2fd8 Make clippy an optional dependency 2016-02-17 02:07:41 +05:30
Tomusdrw 2c4700f4c1 Fixing clippy warnings 2016-02-15 00:55:45 +01:00
debris 9159d5812b eth_syncing, fixed #397 2016-02-10 16:28:59 +01:00
Nikolay Volf efef36b5e8 handling sync message 2016-02-07 03:00:43 +03:00
Nikolay Volf 90e4722284 Merge branch 'master' into block-propagation 2016-02-05 21:47:27 +03:00
Nikolay Volf cc3f712fec propagade initial 2016-02-05 09:34:08 -08:00
debris c90d64662a added license in every *.rs file 2016-02-05 13:40:41 +01:00
Nikolay Volf c0776b75b6 moving sources for proper test setup 2016-02-04 21:30:31 +03:00