From 639d132c98b9ae2c43a98c2f060bdf614687a3fb Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sat, 3 Feb 2018 11:51:34 -0700 Subject: [PATCH] Change process overspend to negative_spend --- rai/core_test/ledger.cpp | 4 ++-- rai/node/node.cpp | 4 ++-- rai/node/rpc.cpp | 3 ++- rai/secure.cpp | 2 +- rai/secure.hpp | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rai/core_test/ledger.cpp b/rai/core_test/ledger.cpp index cbc63b9e..a76f62b2 100644 --- a/rai/core_test/ledger.cpp +++ b/rai/core_test/ledger.cpp @@ -970,7 +970,7 @@ TEST (ledger, fail_send_bad_signature) ASSERT_EQ (rai::process_result::bad_signature, result1.code); } -TEST (ledger, fail_send_overspend) +TEST (ledger, fail_send_negative_spend) { bool init (false); rai::block_store store (init, rai::unique_path ()); @@ -984,7 +984,7 @@ TEST (ledger, fail_send_overspend) ASSERT_EQ (rai::process_result::progress, ledger.process (transaction, block1).code); rai::keypair key2; rai::send_block block2 (block1.hash (), key2.pub, 2, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0); - ASSERT_EQ (rai::process_result::overspend, ledger.process (transaction, block2).code); + ASSERT_EQ (rai::process_result::negative_spend, ledger.process (transaction, block2).code); } TEST (ledger, fail_send_fork) diff --git a/rai/node/node.cpp b/rai/node/node.cpp index 5f8e205f..2dc252b5 100644 --- a/rai/node/node.cpp +++ b/rai/node/node.cpp @@ -1285,11 +1285,11 @@ rai::process_return rai::block_processor::process_receive_one (MDB_txn * transac } break; } - case rai::process_result::overspend: + case rai::process_result::negative_spend: { if (node.config.logging.ledger_logging ()) { - BOOST_LOG (node.log) << boost::str (boost::format ("Overspend for: %1%") % block_a->hash ().to_string ()); + BOOST_LOG (node.log) << boost::str (boost::format ("Negative spend for: %1%") % block_a->hash ().to_string ()); } break; } diff --git a/rai/node/rpc.cpp b/rai/node/rpc.cpp index ea1f0c33..5fd9dce0 100644 --- a/rai/node/rpc.cpp +++ b/rai/node/rpc.cpp @@ -2412,8 +2412,9 @@ void rai::rpc_handler::process () error_response (response, "Bad signature"); break; } - case rai::process_result::overspend: + case rai::process_result::negative_spend: { + // TODO once we get RPC versioning, this should be changed to "negative spend" error_response (response, "Overspend"); break; } diff --git a/rai/secure.cpp b/rai/secure.cpp index e8844467..68ff1e99 100644 --- a/rai/secure.cpp +++ b/rai/secure.cpp @@ -2407,7 +2407,7 @@ void ledger_processor::send_block (rai::send_block const & block_a) auto latest_error (ledger.store.account_get (transaction, account, info)); assert (!latest_error); assert (info.head == block_a.hashables.previous); - result.code = info.balance.number () >= block_a.hashables.balance.number () ? rai::process_result::progress : rai::process_result::overspend; // Is this trying to spend more than they have (Malicious) + result.code = info.balance.number () >= block_a.hashables.balance.number () ? rai::process_result::progress : rai::process_result::negative_spend; // Is this trying to spend a negative amount (Malicious) if (result.code == rai::process_result::progress) { auto amount (info.balance.number () - block_a.hashables.balance.number ()); diff --git a/rai/secure.hpp b/rai/secure.hpp index fc001d7e..5f93e0a8 100644 --- a/rai/secure.hpp +++ b/rai/secure.hpp @@ -312,7 +312,7 @@ enum class process_result progress, // Hasn't been seen before, signed correctly bad_signature, // Signature was bad, forged or transmission error old, // Already seen and was valid - overspend, // Malicious attempt to overspend + negative_spend, // Malicious attempt to spend a negative amount fork, // Malicious fork based on previous unreceivable, // Source block doesn't exist or has already been received gap_previous, // Block marked as previous is unknown