nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6599

Browse Source 
6e4a55b rpc: fix relay_tx error return mixup (moneromooo-monero)
9b86e14 functional_tests: add simple relay_tx test (moneromooo-monero)
This commit is contained in:
luigi1111 2020-07-08 17:20:29 -05:00
commit 3057f52f89
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/core_rpc_server.cpp
View File

@ -2816,7 +2816,7 @@ namespace cryptonote
crypto::hash txid = *reinterpret_cast<const crypto::hash*>(txid_data.data()); crypto::hash txid = *reinterpret_cast<const crypto::hash*>(txid_data.data());
cryptonote::blobdata txblob; cryptonote::blobdata txblob;
if (!m_core.get_pool_transaction(txid, txblob, relay_category::legacy)) if (m_core.get_pool_transaction(txid, txblob, relay_category::legacy))
{ {
NOTIFY_NEW_TRANSACTIONS::request r; NOTIFY_NEW_TRANSACTIONS::request r;
r.txs.push_back(std::move(txblob)); r.txs.push_back(std::move(txblob));

11
tests/functional_tests/txpool.py
View File

@ -241,6 +241,17 @@ class TransferTest():
assert x.fee == txes[txid].fee assert x.fee == txes[txid].fee
assert x.tx_blob == txes[txid].tx_blob assert x.tx_blob == txes[txid].tx_blob
print('Checking relaying txes')
res = daemon.get_transaction_pool_hashes()
assert len(res.tx_hashes) > 0
txid = res.tx_hashes[0]
daemon.relay_tx([txid])
res = daemon.get_transactions([txid])
assert len(res.txs) == 1
assert res.txs[0].tx_hash == txid
assert res.txs[0].in_pool
assert res.txs[0].relayed
daemon.flush_txpool() daemon.flush_txpool()
self.check_empty_pool() self.check_empty_pool()