From bcc14df33270cfb92799ae3c8c0f02333f2d1565 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 4 Dec 2020 13:06:57 -0500 Subject: [PATCH] Hush Is Global --- src/hush.h | 2 +- src/{komodo_globals.h => hush_globals.h} | 0 src/komodo-tx.cpp | 2 +- src/test/rpc_tests.cpp | 7 +------ 4 files changed, 3 insertions(+), 8 deletions(-) rename src/{komodo_globals.h => hush_globals.h} (100%) diff --git a/src/hush.h b/src/hush.h index 102dc433a..1b3107eda 100644 --- a/src/hush.h +++ b/src/hush.h @@ -44,7 +44,7 @@ int32_t hush_connectblock(bool fJustCheck, CBlockIndex *pindex,CBlock& block); bool check_pprevnotarizedht(); #include "komodo_structs.h" -#include "komodo_globals.h" +#include "hush_globals.h" #include "hush_utils.h" #include "komodo_curve25519.h" #include "komodo_cJSON.c" diff --git a/src/komodo_globals.h b/src/hush_globals.h similarity index 100% rename from src/komodo_globals.h rename to src/hush_globals.h diff --git a/src/komodo-tx.cpp b/src/komodo-tx.cpp index e5dc04a31..fbd06ad36 100644 --- a/src/komodo-tx.cpp +++ b/src/komodo-tx.cpp @@ -43,7 +43,7 @@ using namespace std; #include "uint256.h" #include "arith_uint256.h" #include "komodo_structs.h" -#include "komodo_globals.h" +#include "hush_globals.h" #include "hush_defs.h" #include "komodo_interest.h" diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index 64d1bb744..354ed4f13 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -5,22 +5,17 @@ #include "rpc/server.h" #include "rpc/client.h" - #include "key_io.h" #include "netbase.h" #include "utilstrencodings.h" - #include "test/test_bitcoin.h" - #include #include - #include using namespace std; -UniValue -createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL) +UniValue createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL) { UniValue result(UniValue::VARR); result.push_back(nRequired);