aboutsummaryrefslogtreecommitdiff
path: root/src/merkleblock.h
diff options
context:
space:
mode:
authorMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-11-28 17:03:19 +0100
committerMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-11-28 17:49:41 +0100
commitfa02c08c93e5867b7ea07d79ca1c0917dcde88e0 (patch)
tree39b3735cac63b8332f5e22ca791711bb919b50b3 /src/merkleblock.h
parent26b7bcf10ebcc055cf6226629498a09986ce0e6c (diff)
downloadbitcoin-fa02c08c93e5867b7ea07d79ca1c0917dcde88e0.tar.xz
refactor: Use Txid in CMerkleBlock
Diffstat (limited to 'src/merkleblock.h')
-rw-r--r--src/merkleblock.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/merkleblock.h b/src/merkleblock.h
index b546b17f52..12b41a581e 100644
--- a/src/merkleblock.h
+++ b/src/merkleblock.h
@@ -11,6 +11,7 @@
#include <serialize.h>
#include <uint256.h>
+#include <set>
#include <vector>
// Helper functions for serialization.
@@ -144,7 +145,7 @@ public:
CMerkleBlock(const CBlock& block, CBloomFilter& filter) : CMerkleBlock(block, &filter, nullptr) { }
// Create from a CBlock, matching the txids in the set
- CMerkleBlock(const CBlock& block, const std::set<uint256>& txids) : CMerkleBlock(block, nullptr, &txids) { }
+ CMerkleBlock(const CBlock& block, const std::set<Txid>& txids) : CMerkleBlock{block, nullptr, &txids} {}
CMerkleBlock() {}
@@ -152,7 +153,7 @@ public:
private:
// Combined constructor to consolidate code
- CMerkleBlock(const CBlock& block, CBloomFilter* filter, const std::set<uint256>* txids);
+ CMerkleBlock(const CBlock& block, CBloomFilter* filter, const std::set<Txid>* txids);
};
#endif // BITCOIN_MERKLEBLOCK_H