Merge pull request #424 from jrawsthorne/wtxid-inv

Fix: Change WitnessTransaction inv type to use txid
This commit is contained in:
Andrew Poelstra 2020-05-14 13:51:16 +00:00 committed by GitHub
commit c44bad87b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -24,7 +24,7 @@ use hashes::sha256d;
use network::constants; use network::constants;
use consensus::encode::{self, Decodable, Encodable}; use consensus::encode::{self, Decodable, Encodable};
use hash_types::{BlockHash, Txid, Wtxid}; use hash_types::{BlockHash, Txid};
/// An inventory item. /// An inventory item.
#[derive(PartialEq, Eq, Clone, Debug, Copy, Hash)] #[derive(PartialEq, Eq, Clone, Debug, Copy, Hash)]
@ -36,7 +36,7 @@ pub enum Inventory {
/// Block /// Block
Block(BlockHash), Block(BlockHash),
/// Witness Transaction /// Witness Transaction
WitnessTransaction(Wtxid), WitnessTransaction(Txid),
/// Witness Block /// Witness Block
WitnessBlock(BlockHash), WitnessBlock(BlockHash),
} }