milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #128 from jeandudey/2018-08-12-bitcoinconsenus 

Remove unused "bitcoinconsenus" feature.
This commit is contained in:
Andrew Poelstra 2018-08-15 20:55:51 +00:00 committed by GitHub
parent a1c9a25d07 f918311b8a
commit 6c82001ead
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -16,7 +16,6 @@ name = "bitcoin"
path = "src/lib.rs" path = "src/lib.rs"
[features] [features]
bitcoinconsenus = ["bitcoinconsensus"]
fuzztarget = ["secp256k1/fuzztarget"] fuzztarget = ["secp256k1/fuzztarget"]
[dependencies] [dependencies]
@ -26,7 +25,7 @@ rand = "0.3"
rust-crypto = "0.2" rust-crypto = "0.2"
serde = "0.6" serde = "0.6"
strason = "0.3" strason = "0.3"
bitcoinconsensus = { version = "0.16", optional=true } bitcoinconsensus = { version = "0.16", optional = true }
[dependencies.hex] [dependencies.hex]
git = "https://github.com/KokaKiwi/rust-hex" git = "https://github.com/KokaKiwi/rust-hex"

2
README.md
View File

@ -74,7 +74,7 @@ downstream users to also have a `num` dependency just so they can use `Uint256::
* Removed old script interpreter * Removed old script interpreter
* A new optional feature "bitcoinconsenus" lets this library use Bitcoin Core's native * A new optional feature "bitcoinconsensus" lets this library use Bitcoin Core's native
script verifier, wrappend into Rust by the rust-bitcoinconsenus project. script verifier, wrappend into Rust by the rust-bitcoinconsenus project.
See `Transaction::verify` and `Script::verify` methods. See `Transaction::verify` and `Script::verify` methods.

2
src/blockdata/script.rs
View File

@ -183,7 +183,7 @@ impl error::Error for Error {
Error::EarlyEndOfScript => "unexpected end of script", Error::EarlyEndOfScript => "unexpected end of script",
Error::NumericOverflow => "numeric overflow (number on stack larger than 4 bytes)", Error::NumericOverflow => "numeric overflow (number on stack larger than 4 bytes)",
#[cfg(feature="bitcoinconsensus")] #[cfg(feature="bitcoinconsensus")]
Error::BitcoinConsensus(ref _n) => "bitcoinconsenus verification failed", Error::BitcoinConsensus(ref _n) => "bitcoinconsensus verification failed",
#[cfg(feature="bitcoinconsensus")] #[cfg(feature="bitcoinconsensus")]
Error::UnknownSpentTransaction (ref _hash) => "unknown transaction referred in Transaction::verify()", Error::UnknownSpentTransaction (ref _hash) => "unknown transaction referred in Transaction::verify()",
#[cfg(feature="bitcoinconsensus")] #[cfg(feature="bitcoinconsensus")]