fix for upstream

This commit is contained in:
Andrew Poelstra 2014-08-18 18:04:32 -07:00
parent c54f0c36a3
commit e29fdb90c8
2 changed files with 2 additions and 2 deletions

View File

@ -4,7 +4,7 @@ name = "bitcoin"
version = "0.0.1" version = "0.0.1"
authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>"] authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>"]
[[lib]] [lib]
name = "bitcoin" name = "bitcoin"
path = "src/lib.rs" path = "src/lib.rs"

View File

@ -39,7 +39,7 @@ use secp256k1::key::PublicKey;
use blockdata::opcodes; use blockdata::opcodes;
use blockdata::opcodes::Opcode; use blockdata::opcodes::Opcode;
use allops = blockdata::opcodes::all; use blockdata::opcodes::all as allops;
use blockdata::transaction::{Transaction, TxIn}; use blockdata::transaction::{Transaction, TxIn};
use network::encodable::{ConsensusDecodable, ConsensusEncodable}; use network::encodable::{ConsensusDecodable, ConsensusEncodable};
use network::serialize::{SimpleDecoder, SimpleEncoder, serialize}; use network::serialize::{SimpleDecoder, SimpleEncoder, serialize};