rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-30 03:03:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6286

Browse source 
6d6af70 cryptonote_basic: drop unused verification_context::m_not_rct field (xiphon)
This commit is contained in:
luigi1111 2020-04-04 12:33:32 -05:00
commit 4398facb2e
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
6 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cryptonote_basic/verification_context.h
View file

@ -47,7 +47,6 @@ namespace cryptonote
bool m_too_big; bool m_too_big;
bool m_overspend; bool m_overspend;
bool m_fee_too_low; bool m_fee_too_low;
bool m_not_rct;
bool m_too_few_outputs; bool m_too_few_outputs;
}; };

2
src/rpc/core_rpc_server.cpp
View file

@ -1134,8 +1134,6 @@ namespace cryptonote
add_reason(reason, "overspend"); add_reason(reason, "overspend");
if ((res.fee_too_low = tvc.m_fee_too_low)) if ((res.fee_too_low = tvc.m_fee_too_low))
add_reason(reason, "fee too low"); add_reason(reason, "fee too low");
if ((res.not_rct = tvc.m_not_rct))
add_reason(reason, "tx is not ringct");
if ((res.too_few_outputs = tvc.m_too_few_outputs)) if ((res.too_few_outputs = tvc.m_too_few_outputs))
add_reason(reason, "too few outputs"); add_reason(reason, "too few outputs");
const std::string punctuation = reason.empty() ? "" : ": "; const std::string punctuation = reason.empty() ? "" : ": ";

2
src/rpc/core_rpc_server_commands_defs.h
View file

@ -588,7 +588,6 @@ namespace cryptonote
bool too_big; bool too_big;
bool overspend; bool overspend;
bool fee_too_low; bool fee_too_low;
bool not_rct;
bool too_few_outputs; bool too_few_outputs;
bool sanity_check_failed; bool sanity_check_failed;
@ -603,7 +602,6 @@ namespace cryptonote
KV_SERIALIZE(too_big) KV_SERIALIZE(too_big)
KV_SERIALIZE(overspend) KV_SERIALIZE(overspend)
KV_SERIALIZE(fee_too_low) KV_SERIALIZE(fee_too_low)
KV_SERIALIZE(not_rct)
KV_SERIALIZE(too_few_outputs) KV_SERIALIZE(too_few_outputs)
KV_SERIALIZE(sanity_check_failed) KV_SERIALIZE(sanity_check_failed)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()

5
src/rpc/daemon_handler.cpp
View file

@ -410,11 +410,6 @@ namespace rpc
if (!res.error_details.empty()) res.error_details += " and "; if (!res.error_details.empty()) res.error_details += " and ";
res.error_details += "fee too low"; res.error_details += "fee too low";
} }
if (tvc.m_not_rct)
{
if (!res.error_details.empty()) res.error_details += " and ";
res.error_details += "tx is not ringct";
}
if (tvc.m_too_few_outputs) if (tvc.m_too_few_outputs)
{ {
if (!res.error_details.empty()) res.error_details += " and "; if (!res.error_details.empty()) res.error_details += " and ";

2
src/wallet/wallet2.cpp
View file

@ -240,8 +240,6 @@ namespace
add_reason(reason, "overspend"); add_reason(reason, "overspend");
if (res.fee_too_low) if (res.fee_too_low)
add_reason(reason, "fee too low"); add_reason(reason, "fee too low");
if (res.not_rct)
add_reason(reason, "tx is not ringct");
if (res.sanity_check_failed) if (res.sanity_check_failed)
add_reason(reason, "tx sanity check failed"); add_reason(reason, "tx sanity check failed");
if (res.not_relayed) if (res.not_relayed)

3
tests/functional_tests/transfer.py
View file

@ -256,7 +256,6 @@ class TransferTest():
assert res.too_big == False assert res.too_big == False
assert res.overspend == False assert res.overspend == False
assert res.fee_too_low == False assert res.fee_too_low == False
assert res.not_rct == False
self.wallet[0].refresh() self.wallet[0].refresh()
@ -598,7 +597,6 @@ class TransferTest():
assert res.too_big == False assert res.too_big == False
assert res.overspend == False assert res.overspend == False
assert res.fee_too_low == False assert res.fee_too_low == False
assert res.not_rct == False
res = daemon.get_transactions([txes[0][0]]) res = daemon.get_transactions([txes[0][0]])
assert len(res.txs) >= 1 assert len(res.txs) >= 1
@ -615,7 +613,6 @@ class TransferTest():
assert res.too_big == False assert res.too_big == False
assert res.overspend == False assert res.overspend == False
assert res.fee_too_low == False assert res.fee_too_low == False
assert res.not_rct == False
assert res.too_few_outputs == False assert res.too_few_outputs == False
res = daemon.get_transactions([txes[0][0]]) res = daemon.get_transactions([txes[0][0]])