Update bitflags to ^0.1 (#682)

* Removed unused crates
* Add listconnectedpeers in grin client
* Update bitflags to ^0.1 globally
This commit is contained in:
Quentin Le Sceller
2018-02-05 14:43:54 -05:00
committed by Ignotus Peverell
parent 1f7dd4eb73
commit 8a7eb94759
22 changed files with 109 additions and 109 deletions
+2 -2
View File
@@ -12,7 +12,7 @@ use std::clone::Clone;
use std::sync::RwLock;
use core::core::{block, hash, transaction};
use core::core::{COINBASE_OUTPUT, Input, OutputIdentifier};
use core::core::{OutputFeatures, Input, OutputIdentifier};
use core::global;
use core::core::hash::Hashed;
use types::{BlockChain, PoolError};
@@ -114,7 +114,7 @@ impl BlockChain for DummyChainImpl {
}
fn is_matured(&self, input: &Input, height: u64) -> Result<(), PoolError> {
if !input.features.contains(COINBASE_OUTPUT) {
if !input.features.contains(OutputFeatures::COINBASE_OUTPUT) {
return Ok(());
}
let block_hash = input.out_block.expect("requires a block hash");
+4 -4
View File
@@ -298,7 +298,7 @@ mod tests {
use util::secp;
use keychain::Keychain;
use rand;
use core::core::{DEFAULT_OUTPUT, SwitchCommitHash};
use core::core::{OutputFeatures, SwitchCommitHash};
#[test]
fn test_add_entry() {
@@ -317,12 +317,12 @@ mod tests {
let inputs = vec![
core::transaction::Input::new(
DEFAULT_OUTPUT,
OutputFeatures::DEFAULT_OUTPUT,
keychain.commit(50, &key_id2).unwrap(),
None,
),
core::transaction::Input::new(
DEFAULT_OUTPUT,
OutputFeatures::DEFAULT_OUTPUT,
keychain.commit(25, &key_id3).unwrap(),
None,
),
@@ -330,7 +330,7 @@ mod tests {
let msg = secp::pedersen::ProofMessage::empty();
let output = core::transaction::Output {
features: DEFAULT_OUTPUT,
features: OutputFeatures::DEFAULT_OUTPUT,
commit: output_commit,
switch_commit_hash: switch_commit_hash,
proof: keychain
+2 -2
View File
@@ -1321,7 +1321,7 @@ mod tests {
let proof = keychain.range_proof(value, &key_id, commit, msg).unwrap();
transaction::Output {
features: transaction::DEFAULT_OUTPUT,
features: transaction::OutputFeatures::DEFAULT_OUTPUT,
commit: commit,
switch_commit_hash: switch_commit_hash,
proof: proof,
@@ -1343,7 +1343,7 @@ mod tests {
let proof = keychain.range_proof(value, &key_id, commit, msg).unwrap();
transaction::Output {
features: transaction::COINBASE_OUTPUT,
features: transaction::OutputFeatures::COINBASE_OUTPUT,
commit: commit,
switch_commit_hash: switch_commit_hash,
proof: proof,