Fix GetDynamicPerKbFeeEstimate test

pull/111/head
moneroexamples 6 years ago
parent 70306e9003
commit 012b4a1123

@ -676,7 +676,7 @@ YourMoneroRequests::get_unspent_outs(
string rct = out.get_rct();
// coinbaser rct txs require speciall treatment
// coinbase rct txs require speciall treatment
if (tx.coinbase && tx.is_rct)
{
uint64_t amount = (tx.is_rct ? 0 : out.amount);
@ -703,7 +703,7 @@ YourMoneroRequests::get_unspent_outs(
{"tx_prefix_hash" , tx.prefix_hash},
{"tx_pub_key" , tx.tx_pub_key},
{"timestamp" , static_cast<uint64_t>(
out.timestamp)},
out.timestamp*1e3)},
{"height" , tx.height},
{"spend_key_images", json::array()}
};
@ -740,8 +740,8 @@ YourMoneroRequests::get_unspent_outs(
// it is already using dynanamic fees. frontend
// uses old fixed fees.
j_response["per_kb_fee"] = std::to_string(current_bc_status
->get_dynamic_per_kb_fee_estimate());
j_response["per_kb_fee"] = current_bc_status
->get_dynamic_per_kb_fee_estimate();
} // if (current_bc_status->search_thread_exist(xmr_address))

@ -611,10 +611,10 @@ TEST_P(BCSTATUS_TEST, GetOutput)
TEST_P(BCSTATUS_TEST, GetDynamicPerKbFeeEstimate)
{
EXPECT_CALL(*mcore_ptr, get_dynamic_per_kb_fee_estimate(_))
EXPECT_CALL(*mcore_ptr, get_dynamic_base_fee_estimate(_))
.WillOnce(Return(3333));
EXPECT_EQ(bcs->get_dynamic_per_kb_fee_estimate(), 3333);
EXPECT_EQ(bcs->get_dynamic_per_kb_fee_estimate(), 3333 * 1024);
}
TEST_P(BCSTATUS_TEST, CommitTx)

@ -93,7 +93,7 @@ public:
bool(const COMMAND_RPC_GET_OUTPUTS_BIN::request& req,
COMMAND_RPC_GET_OUTPUTS_BIN::response& res));
MOCK_CONST_METHOD1(get_dynamic_per_kb_fee_estimate,
MOCK_CONST_METHOD1(get_dynamic_base_fee_estimate,
uint64_t(uint64_t const& grace_blocks));
MOCK_CONST_METHOD2(get_mempool_txs,

Loading…
Cancel
Save