Page MenuHomePhabricator
Files F14864847

D16084.id47509.diff
No OneTemporary
Actions

D16084.id47509.diff
View Options

diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -102,7 +102,7 @@
expectUseCount(pool, block_txid2, 1);
size_t poolSize = pool.size();
- pool.removeRecursive(*block.vtx[2], MemPoolRemovalReason::REPLACED);
+ pool.removeRecursive(*block.vtx[2], MemPoolRemovalReason::CONFLICT);
BOOST_CHECK_EQUAL(pool.size(), poolSize - 1);
CBlock block2;
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -20,7 +20,7 @@
BOOST_FIXTURE_TEST_SUITE(mempool_tests, TestingSetup)
-static constexpr auto REMOVAL_REASON_DUMMY = MemPoolRemovalReason::REPLACED;
+static constexpr auto REMOVAL_REASON_DUMMY = MemPoolRemovalReason::CONFLICT;
BOOST_AUTO_TEST_CASE(MempoolRemoveTest) {
// Test CTxMemPool::remove functionality
diff --git a/src/txmempool.h b/src/txmempool.h
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -156,8 +156,6 @@
BLOCK,
//! Removed for conflict with in-block transaction
CONFLICT,
- //! Removed for replacement
- REPLACED,
//! Removed by avalanche vote
AVALANCHE,
};

File Metadata

Mime Type
text/plain
Expires
Tue, May 20, 22:50 (4 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5866092
Default Alt Text
D16084.id47509.diff (1 KB)

Event Timeline