Head Fix on bitcoin#8788 merge

absolute-community · Feb 24, 2019 · 2976bb4 · 2976bb4
1 parent 29dbefd
commit 2976bb4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/src/rest.cpp b/src/rest.cpp
@@ -277,12 +277,9 @@ static bool rest_block_notxdetails(HTTPRequest* req, const std::string& strURIPa
 }
 
 // A bit of a hack - dependency on a function defined in rpc/blockchain.cpp
-<<<<<<< HEAD
-UniValue getblockchaininfo(const UniValue& params, bool fHelp);
-=======
+
 UniValue getblockchaininfo(const JSONRPCRequest& request);
 
->>>>>>> dd6b9ad20... Merge #8788: [RPC] Give RPC commands more information about the RPC request
 static bool rest_chaininfo(HTTPRequest* req, const std::string& strURIPart)
 {
     if (!CheckWarmup(req))

diff --git a/src/rpc/server.h b/src/rpc/server.h
@@ -40,12 +40,8 @@ struct UniValueType {
     bool typeAny;
     UniValue::VType type;
 };
-<<<<<<< HEAD
-class JSONRequest
-=======
 
 class JSONRPCRequest
->>>>>>> dd6b9ad20... Merge #8788: [RPC] Give RPC commands more information about the RPC request
 {
 public:
     UniValue id;

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -640,13 +640,9 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-<<<<<<< HEAD
     // Absolute address
-    CBitcoinAddress address = CBitcoinAddress(params[0].get_str());
-=======
-    // Dash address
     CBitcoinAddress address = CBitcoinAddress(request.params[0].get_str());
->>>>>>> dd6b9ad20... Merge #8788: [RPC] Give RPC commands more information about the RPC request
+
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Absolute address");
     CScript scriptPubKey = GetScriptForDestination(address.Get());
@@ -735,12 +731,7 @@ UniValue getreceivedbyaccount(const JSONRPCRequest& request)
     return ValueFromAmount(nAmount);
 }
 
-<<<<<<< HEAD
-UniValue getbalance(const UniValue& params, bool fHelp)
-=======
-
 UniValue getbalance(const JSONRPCRequest& request)
->>>>>>> dd6b9ad20... Merge #8788: [RPC] Give RPC commands more information about the RPC request
 {
     if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
@@ -917,13 +908,8 @@ UniValue sendfrom(const JSONRPCRequest& request)
     string strAccount = AccountFromValue(request.params[0]);
     CBitcoinAddress address(request.params[1].get_str());
     if (!address.IsValid())
-<<<<<<< HEAD
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Absolute address");
-    CAmount nAmount = AmountFromValue(params[2]);
-=======
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dash address");
     CAmount nAmount = AmountFromValue(request.params[2]);
->>>>>>> dd6b9ad20... Merge #8788: [RPC] Give RPC commands more information about the RPC request
     if (nAmount <= 0)
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send");
     int nMinDepth = 1;