From 0ccdea3cd86d41958f54aa6f4208ccc6b78f2094 Mon Sep 17 00:00:00 2001 From: Nik Bougalis Date: Mon, 5 Jan 2015 13:43:56 -0800 Subject: [PATCH] Disable Ticket transactions and tests --- src/BeastConfig.h | 7 +++++++ src/ripple/app/transactors/CancelTicket.cpp | 4 ++++ src/ripple/app/transactors/CreateTicket.cpp | 4 ++++ src/ripple/protocol/TER.h | 1 + src/ripple/protocol/impl/TER.cpp | 3 ++- test/ticket-test.js | 2 +- 6 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/BeastConfig.h b/src/BeastConfig.h index 1f7d5c6b44..b0457379a4 100644 --- a/src/BeastConfig.h +++ b/src/BeastConfig.h @@ -204,4 +204,11 @@ #define RIPPLE_HOOK_VALIDATORS 0 #endif +/** Config: RIPPLE_ENABLE_TICKETS + Enables processing of ticket transactions +*/ +#ifndef RIPPLE_ENABLE_TICKETS +#define RIPPLE_ENABLE_TICKETS 0 +#endif + #endif diff --git a/src/ripple/app/transactors/CancelTicket.cpp b/src/ripple/app/transactors/CancelTicket.cpp index 6602a9f0ff..a36fce12ce 100644 --- a/src/ripple/app/transactors/CancelTicket.cpp +++ b/src/ripple/app/transactors/CancelTicket.cpp @@ -90,7 +90,11 @@ transact_CancelTicket ( TransactionEngineParams params, TransactionEngine* engine) { +#if RIPPLE_ENABLE_TICKETS return CancelTicket (txn, params, engine).apply (); +#else + return temDISABLED; +#endif } diff --git a/src/ripple/app/transactors/CreateTicket.cpp b/src/ripple/app/transactors/CreateTicket.cpp index 4445d908cc..9f5fc24d74 100644 --- a/src/ripple/app/transactors/CreateTicket.cpp +++ b/src/ripple/app/transactors/CreateTicket.cpp @@ -132,7 +132,11 @@ transact_CreateTicket ( TransactionEngineParams params, TransactionEngine* engine) { +#if RIPPLE_ENABLE_TICKETS return CreateTicket (txn, params, engine).apply (); +#else + return temDISABLED; +#endif } } diff --git a/src/ripple/protocol/TER.h b/src/ripple/protocol/TER.h index abacfdd9f2..e874eb5926 100644 --- a/src/ripple/protocol/TER.h +++ b/src/ripple/protocol/TER.h @@ -81,6 +81,7 @@ enum TER // aka TransactionEngineResult temREDUNDANT, temREDUNDANT_SEND_MAX, temRIPPLE_EMPTY, + temDISABLED, // An intermediate result used internally, should never be returned. temUNCERTAIN, diff --git a/src/ripple/protocol/impl/TER.cpp b/src/ripple/protocol/impl/TER.cpp index 9633216229..284e84572f 100644 --- a/src/ripple/protocol/impl/TER.cpp +++ b/src/ripple/protocol/impl/TER.cpp @@ -117,7 +117,8 @@ bool transResultInfo (TER code, std::string& token, std::string& text) { temREDUNDANT_SEND_MAX, "temREDUNDANT_SEND_MAX", "Send max is redundant." }, { temRIPPLE_EMPTY, "temRIPPLE_EMPTY", "PathSet with no paths." }, { temUNCERTAIN, "temUNCERTAIN", "In process of determining result. Never returned." }, - { temUNKNOWN, "temUNKNOWN", "The transactions requires logic not implemented yet." }, + { temUNKNOWN, "temUNKNOWN", "The transaction requires logic that is not implemented yet." }, + { temDISABLED, "temDISABLED", "The transaction requires logic that is currently disabled." }, { terRETRY, "terRETRY", "Retry transaction." }, { terFUNDS_SPENT, "terFUNDS_SPENT", "Can't set password, password set funds already spent." }, diff --git a/test/ticket-test.js b/test/ticket-test.js index 48141baee3..6326adec4c 100644 --- a/test/ticket-test.js +++ b/test/ticket-test.js @@ -33,7 +33,7 @@ var submit_transaction_factory = function(remote) { /* ---------------------------------- TESTS --------------------------------- */ -suite("Ticket tests", function() { +suite.skip("Ticket tests", function() { var $ = { }; var submit_tx;