diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/amount_tests.cpp | 10 | ||||
| -rw-r--r-- | src/test/miner_tests.cpp | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp index 47e73ed38..80a6c3a6f 100644 --- a/src/test/amount_tests.cpp +++ b/src/test/amount_tests.cpp @@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(GetFeeTest) BOOST_CHECK_EQUAL(feeRate.GetFee(1e5), 0); feeRate = CFeeRate(1000); - // Must always just return the arg + // Wallet fees are rounded up BOOST_CHECK_EQUAL(feeRate.GetFee(0), 0); BOOST_CHECK_EQUAL(feeRate.GetFee(1), 1000); BOOST_CHECK_EQUAL(feeRate.GetFee(121), 1000); @@ -27,6 +27,14 @@ BOOST_AUTO_TEST_CASE(GetFeeTest) BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), 1000); BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), 9000); + // Relay fees must always just return the arg + BOOST_CHECK_EQUAL(feeRate.GetRelayFee(0), 0); + BOOST_CHECK_EQUAL(feeRate.GetRelayFee(1), 1); + BOOST_CHECK_EQUAL(feeRate.GetRelayFee(121), 121); + BOOST_CHECK_EQUAL(feeRate.GetRelayFee(999), 999); + BOOST_CHECK_EQUAL(feeRate.GetRelayFee(1e3), 1e3); + BOOST_CHECK_EQUAL(feeRate.GetRelayFee(9e3), 9e3); + feeRate = CFeeRate(-1000); // Must always just return -1 * arg BOOST_CHECK_EQUAL(feeRate.GetFee(0), 0); diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index ba06a2ab7..3995d3096 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -121,7 +121,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, // Calculate a fee on child transaction that will put the package just // below the block min tx fee (assuming 1 child tx of the same size). - CAmount feeToUse = blockMinFeeRate.GetFee(2*freeTxSize) - 1; + CAmount feeToUse = blockMinFeeRate.GetRelayFee(2*freeTxSize) - 1; tx.vin[0].prevout.hash = hashFreeTx; tx.vout[0].nValue = 5000000000LL - 1000 - 50000 - feeToUse; @@ -158,7 +158,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, // This tx can't be mined by itself tx.vin[0].prevout.hash = hashFreeTx2; tx.vout.resize(1); - feeToUse = blockMinFeeRate.GetFee(freeTxSize); + feeToUse = blockMinFeeRate.GetRelayFee(freeTxSize); tx.vout[0].nValue = 5000000000LL - 100000000 - feeToUse; uint256 hashLowFeeTx2 = tx.GetHash(); mempool.addUnchecked(hashLowFeeTx2, entry.Fee(feeToUse).SpendsCoinbase(false).FromTx(tx)); |