Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

ethminer as crate #700

Merged
merged 61 commits into from
Mar 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
99a6802
Moving block sealing and transaction_queue to separate create
Mar 8, 2016
84444c6
Adding ethminer to dev/ci files
Mar 8, 2016
9acb36a
Fixing tests compilation. Removing ethminer dependency on client
Mar 8, 2016
49f1834
Fixing travis yml whitespace
Mar 8, 2016
5db84c3
Adding transactions to block
Mar 9, 2016
9d66433
Tratifying Miner
Mar 9, 2016
363de97
Adding documentation and ditching EthMiner
Mar 9, 2016
493c61f
Minimal gas price threshold. Closes: #636
Mar 9, 2016
3d74e5b
Fixing doctest
Mar 9, 2016
3c0587b
Merge branch 'ethminer_crate' into tx_queue_min_gas
Mar 9, 2016
2f9b955
Merge branch 'master' into ethminer_crate
Mar 10, 2016
ca2cf8e
Lowering minimal gas price
Mar 10, 2016
02b7e76
Breaking couple of lines to keep number of characters below limit
Mar 10, 2016
90ae750
Update main.rs
gavofyork Mar 10, 2016
cd37fa7
Merge pull request #640 from ethcore/tx_queue_min_gas
gavofyork Mar 10, 2016
2e72173
Merge branch 'master' into ethminer_crate
Mar 10, 2016
eb1fab9
Adding clippy support to ethminer.
Mar 10, 2016
0535fb3
Merge branch 'master' into ethminer_crate
Mar 10, 2016
9db4720
Fixing clippy warnings.
Mar 10, 2016
9ea3c0e
Fixing compilation on beta & stable
Mar 10, 2016
9741d48
Transaction data associated with polls.
Mar 10, 2016
c37370a
PendingTransaction filter.
Mar 10, 2016
92022ac
Merge branch 'master' into ethminer_crate
Mar 10, 2016
0eaf0a8
Updating hook.
Mar 10, 2016
3bbdc03
Fixing doctest.
Mar 11, 2016
5b204a5
Merge branch 'master' into ethminer_crate
Mar 11, 2016
55a14b3
Fixing transaction queue test
Mar 11, 2016
2fd036b
Merge branch 'ethminer_crate' into rpc_pending_filter
Mar 11, 2016
dd2fb4d
Storing BlockNumber & transactions directly in enum
Mar 11, 2016
03da6c9
Merge branch 'master' into ethminer_crate
Mar 11, 2016
197ea7f
Using miner in rpc instead of sync
Mar 11, 2016
36ff65d
Fixing warnings
Mar 11, 2016
b458452
TestSyncProvider fixes
Mar 11, 2016
9c92d60
Merge branch 'master' into ethminer_crate
Mar 11, 2016
0dbe668
adding std::mem
Mar 11, 2016
9f19d29
Merge branch 'master' into ethminer_crate
Mar 11, 2016
c3a79c1
Merge branch 'master' into ethminer_crate
Mar 11, 2016
fadbc61
Merge branch 'ethminer_crate' into rpc_pending_filter
Mar 11, 2016
cd835e8
Merge pull request #661 from ethcore/rpc_pending_filter
debris Mar 11, 2016
7cfe1d2
Adding more detailed logging
Mar 11, 2016
05ff8a0
Merge branch 'ethminer_crate' of github.com:ethcore/parity into ethmi…
Mar 11, 2016
aebc91d
Merge branch 'master' into ethminer_crate
Mar 12, 2016
3ea52c2
Merge branch 'master' into ethminer_crate
Mar 12, 2016
9424d53
Update lib.rs
gavofyork Mar 12, 2016
65dadcc
Adding todos
Mar 12, 2016
e1c0177
Update main.rs
gavofyork Mar 12, 2016
51275f7
Merge branch 'master' of github.com:ethcore/parity
gavofyork Mar 12, 2016
89986ec
Update main.rs
gavofyork Mar 12, 2016
e85a2f3
Update main.rs
gavofyork Mar 12, 2016
e7574d4
Update lib.rs
gavofyork Mar 12, 2016
f0862ac
Merge branch 'master' of github.com:ethcore/parity
gavofyork Mar 13, 2016
826928d
Merge branch 'master' of github.com:ethcore/parity
gavofyork Mar 13, 2016
02f43f2
Merge branch 'ethminer_crate'
gavofyork Mar 13, 2016
4a58e14
Remove duplicate ciippys.
gavofyork Mar 13, 2016
08b9cc2
Merge changes from #674 into branch.
gavofyork Mar 13, 2016
76696e3
Minor build fixes.
gavofyork Mar 13, 2016
b4f7f22
Merge remote-tracking branch 'origin/master' into merge_ethminer
gavofyork Mar 13, 2016
6cedb26
Add missing file.
gavofyork Mar 13, 2016
54ff64c
Merge branch 'master' into merge_ethminer
Mar 13, 2016
e2e067c
Bumping clippy
Mar 13, 2016
4cf18c7
Fixing sync invalid sync test
Mar 13, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ matrix:
- rust: nightly
include:
- rust: stable
env: FEATURES="--features travis-beta" KCOV_FEATURES="" TARGETS="-p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity" ARCHIVE_SUFFIX="-${TRAVIS_OS_NAME}-${TRAVIS_TAG}"
env: FEATURES="--features travis-beta" KCOV_FEATURES="" TARGETS="-p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity -p ethminer" ARCHIVE_SUFFIX="-${TRAVIS_OS_NAME}-${TRAVIS_TAG}"
- rust: beta
env: FEATURES="--features travis-beta" KCOV_FEATURES="" TARGETS="-p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity" ARCHIVE_SUFFIX="-${TRAVIS_OS_NAME}-${TRAVIS_TAG}"
env: FEATURES="--features travis-beta" KCOV_FEATURES="" TARGETS="-p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity -p ethminer" ARCHIVE_SUFFIX="-${TRAVIS_OS_NAME}-${TRAVIS_TAG}"
- rust: nightly
env: FEATURES="--features travis-nightly" KCOV_FEATURES="" TARGETS="-p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity" ARCHIVE_SUFFIX="-${TRAVIS_OS_NAME}-${TRAVIS_TAG}"
env: FEATURES="--features travis-nightly" KCOV_FEATURES="" TARGETS="-p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity -p ethminer" ARCHIVE_SUFFIX="-${TRAVIS_OS_NAME}-${TRAVIS_TAG}"
cache:
apt: true
directories:
Expand Down Expand Up @@ -51,6 +51,7 @@ after_success: |
./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore-* &&
./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethsync-* &&
./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_rpc-* &&
./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethminer-* &&
./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${TRAVIS_JOB_ID} --exclude-pattern /usr/,/.cargo,/root/.multirust target/kcov target/debug/parity-* &&
[ $TRAVIS_BRANCH = master ] &&
[ $TRAVIS_PULL_REQUEST = false ] &&
Expand Down
19 changes: 17 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,19 @@ ctrlc = { git = "https://github.com/tomusdrw/rust-ctrlc.git" }
fdlimit = { path = "util/fdlimit" }
daemonize = "0.2"
number_prefix = "0.2"
rpassword = "0.1"
clippy = { version = "0.0.50", optional = true }
ethcore = { path = "ethcore" }
ethcore-util = { path = "util" }
ethsync = { path = "sync" }
ethminer = { path = "miner" }
ethcore-devtools = { path = "devtools" }
ethcore-rpc = { path = "rpc", optional = true }
rpassword = "0.1"

[features]
default = ["rpc"]
rpc = ["ethcore-rpc"]
dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev"]
dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev", "ethminer/dev"]
travis-beta = ["ethcore/json-tests"]
travis-nightly = ["ethcore/json-tests", "dev"]

Expand Down
23 changes: 17 additions & 6 deletions cov.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,23 @@ if ! type kcov > /dev/null; then
exit 1
fi

cargo test -p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity --no-run || exit $?
cargo test \
-p ethash \
-p ethcore-util \
-p ethcore \
-p ethsync \
-p ethcore-rpc \
-p parity \
-p ethminer \
--no-run || exit $?
rm -rf target/coverage
mkdir -p target/coverage
kcov --exclude-pattern ~/.multirust,rocksdb,secp256k1,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests --include-pattern src --verify target/coverage target/debug/deps/ethcore-*
kcov --exclude-pattern ~/.multirust,rocksdb,secp256k1,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests --include-pattern src --verify target/coverage target/debug/deps/ethash-*
kcov --exclude-pattern ~/.multirust,rocksdb,secp256k1,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests --include-pattern src --verify target/coverage target/debug/deps/ethcore_util-*
kcov --exclude-pattern ~/.multirust,rocksdb,secp256k1,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests --include-pattern src --verify target/coverage target/debug/deps/ethsync-*
kcov --exclude-pattern ~/.multirust,rocksdb,secp256k1,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests --include-pattern src --verify target/coverage target/debug/deps/ethcore_rpc-*

EXCLUDE="~/.multirust,rocksdb,secp256k1,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests"
kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore-*
kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethash-*
kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore_util-*
kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethsync-*
kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore_rpc-*
kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethminer-*
xdg-open target/coverage/index.html
9 changes: 8 additions & 1 deletion doc.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
#!/bin/sh
# generate documentation only for partiy and ethcore libraries

cargo doc --no-deps --verbose -p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity
cargo doc --no-deps --verbose \
-p ethash \
-p ethcore-util \
-p ethcore \
-p ethsync \
-p ethcore-rpc \
-p parity \
-p ethminer