GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update bitflags to ^0.1 (#682)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
api/src/handlers.rs
+3 -3
View File
@@ -24,7 +24,7 @@ use serde::Serialize;
use serde_json;
use chain;
use core::core::{OutputIdentifier, Transaction, DEFAULT_OUTPUT, COINBASE_OUTPUT};
use core::core::{OutputIdentifier, Transaction, OutputFeatures};
use core::core::hash::{Hash, Hashed};
use core::ser;
use pool;
@@ -68,8 +68,8 @@ impl UtxoHandler {
// to compare against the hash in the output MMR.
// For now we can just try both (but this probably needs to be part of the api params)
let outputs = [
OutputIdentifier::new(DEFAULT_OUTPUT, &commit),
OutputIdentifier::new(COINBASE_OUTPUT, &commit)
OutputIdentifier::new(OutputFeatures::DEFAULT_OUTPUT, &commit),
OutputIdentifier::new(OutputFeatures::COINBASE_OUTPUT, &commit)
];
for x in outputs.iter() {
api/src/types.rs
+1 -1
View File
@@ -244,7 +244,7 @@ impl OutputPrintable {
include_proof: bool,
) -> OutputPrintable {
let output_type =
if output.features.contains(core::transaction::COINBASE_OUTPUT) {
if output.features.contains(core::transaction::OutputFeatures::COINBASE_OUTPUT) {
OutputType::Coinbase
} else {
OutputType::Transaction