Skip to content

Commit

Permalink
code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
bitgdev committed Aug 14, 2018
1 parent 5bc000e commit c68e56f
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 14 deletions.
10 changes: 5 additions & 5 deletions src/coins.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <boost/foreach.hpp>
#include <boost/unordered_map.hpp>

/**
/**
****Note - for Bitcoin Green we added fCoinStake to the 2nd bit. Keep in mind when reading the following and adjust as needed.
* Pruned version of CTransaction: only retains metadata and unspent transaction outputs
Expand Down Expand Up @@ -388,10 +388,10 @@ enum {
static const unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS = LOCKTIME_VERIFY_SEQUENCE |
LOCKTIME_MEDIAN_TIME_PAST;

/**
/**
* A reference to a mutable cache entry. Encapsulating it allows us to run
* cleanup code after the modification is finished, and keeping track of
* concurrent modifications.
* concurrent modifications.
*/
class CCoinsModifier
{
Expand All @@ -416,7 +416,7 @@ class CCoinsViewCache : public CCoinsViewBacked

/**
* Make mutable so that we can "fill the cache" even from Get-methods
* declared as "const".
* declared as "const".
*/
mutable uint256 hashBlock;
mutable CCoinsMap cacheCoins;
Expand Down Expand Up @@ -456,7 +456,7 @@ class CCoinsViewCache : public CCoinsViewBacked
//! Calculate the size of the cache (in number of transactions)
unsigned int GetCacheSize() const;

/**
/**
* Amount of bitcoin green coming in to a transaction
* Note that lightweight clients may not know anything besides the hash of previous transactions,
* so may not be able to calculate this.
Expand Down
2 changes: 0 additions & 2 deletions src/qt/blockexplorer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -552,8 +552,6 @@ void BlockExplorer::setContent(const std::string& Content)
{
QString CSS = "body {font-size:12px; color:#333; bgcolor:#fafafa;}\n a, span { font-family: monospace; }\n span.addr {color:#333; font-weight: bold;}\n table tr td {padding: 3px; border: 1px solid black; background-color: #fafafa;}\n td.d0 {font-weight: bold; color:#333;}\n h2, h3 { white-space:nowrap; color:#333;}\n a { color:#337ab7; text-decoration:none; }\n a.nav {color:#337ab7;}\n";
QString FullContent = "<html><head><style type=\"text/css\">" + CSS + "</style></head>" + "<body>" + Content.c_str() + "</body></html>";
// printf(FullContent.toUtf8());

ui->content->setText(FullContent);
}

Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/coincontroldialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@
</property>
</column>
<column>
<property name="text">
<property name="text">
<string>Date</string>
</property>
</column>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/macnotificationhandler.mm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ - (NSString *)__bundleIdentifier
static MacNotificationHandler *s_instance = NULL;
if (!s_instance) {
s_instance = new MacNotificationHandler();

Class aPossibleClass = objc_getClass("NSBundle");
if (aPossibleClass) {
// change NSBundle -bundleIdentifier method to return a correct bundle identifier
Expand Down
1 change: 0 additions & 1 deletion src/rpcclient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
{"getfeeinfo", 0},
{"preparecommunityproposal", 2},
{"submitcommunityproposal", 2},

};

class CRPCConvertTable
Expand Down
6 changes: 3 additions & 3 deletions src/rpcmisc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ UniValue getinfo(const UniValue& params, bool fHelp)
"\nExamples:\n" +
HelpExampleCli("getinfo", "") + HelpExampleRpc("getinfo", ""));

proxyType proxy;
GetProxy(NET_IPV4, proxy);

UniValue obj(UniValue::VOBJ);

// During inital block verification chainActive.Tip() might be not yet initialized
Expand All @@ -85,6 +82,9 @@ UniValue getinfo(const UniValue& params, bool fHelp)
return obj;
}

proxyType proxy;
GetProxy(NET_IPV4, proxy);

obj.push_back(Pair("version", CLIENT_VERSION));
obj.push_back(Pair("protocolversion", PROTOCOL_VERSION));
#ifdef ENABLE_WALLET
Expand Down
2 changes: 1 addition & 1 deletion src/rpcprotocol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ int ReadHTTPMessage(std::basic_istream<char>& stream, map<string, string>& mapHe
* JSON-RPC protocol. Bitcoin Green speaks version 1.0 for maximum compatibility,
* but uses JSON-RPC 1.1/2.0 standards for parts of the 1.0 standard that were
* unspecified (HTTP errors and contents of 'error').
*
*
* 1.0 spec: http://json-rpc.org/wiki/specification
* 1.2 spec: http://jsonrpc.org/historical/json-rpc-over-http.html
* http://www.codeproject.com/KB/recipes/JSON_Spirit.aspx
Expand Down
1 change: 1 addition & 0 deletions src/rpcserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ static const CRPCCommand vRPCCommands[] =
{"bitcoingreen", "checkcommunityproposals", &checkcommunityproposals, true, true, false},
{"bitcoingreen", "getcommunityproposalvotes", &getcommunityproposalvotes, true, true, false},
{"bitcoingreen", "mncommunityvote", &mncommunityvote, true, true, false},

#ifdef ENABLE_WALLET

/* Wallet */
Expand Down

0 comments on commit c68e56f

Please sign in to comment.