Merge pull request #424 from jrawsthorne/wtxid-inv
Fix: Change WitnessTransaction inv type to use txid
This commit is contained in:
commit
c44bad87b2
|
@ -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),
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue