Browse Source

Merge pull request #6539

9f68ed6 typofixes (found by misspell_fixer) (Veres Lajos)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
80cddbbba9
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 6
      contrib/debian/changelog
  2. 2
      depends/config.guess
  3. 2
      qa/rpc-tests/rest.py
  4. 2
      qa/rpc-tests/test_framework/comptool.py
  5. 2
      src/addrman.h
  6. 2
      src/main.cpp
  7. 2
      src/merkleblock.cpp
  8. 2
      src/net.cpp
  9. 2
      src/net.h
  10. 2
      src/netbase.cpp
  11. 2
      src/policy/fees.cpp
  12. 2
      src/policy/fees.h
  13. 2
      src/qt/paymentserver.cpp
  14. 2
      src/qt/rpcconsole.cpp
  15. 2
      src/qt/splashscreen.cpp
  16. 4
      src/rpcserver.cpp
  17. 2
      src/sync.h
  18. 2
      src/test/data/tx_invalid.json
  19. 2
      src/test/data/tx_valid.json
  20. 2
      src/wallet/rpcwallet.cpp

6
contrib/debian/changelog vendored

@ -149,7 +149,7 @@ bitcoin (0.5.3-natty0) natty; urgency=low
bitcoin (0.5.2-natty1) natty; urgency=low bitcoin (0.5.2-natty1) natty; urgency=low
* Remove mentions on anonymity in package descriptions and manpage. * Remove mentions on anonymity in package descriptions and manpage.
These should never have been there, bitcoin isnt anonymous without These should never have been there, bitcoin isn't anonymous without
a ton of work that virtually no users will ever be willing and a ton of work that virtually no users will ever be willing and
capable of doing capable of doing
@ -190,7 +190,7 @@ bitcoin (0.5.0~rc1-natty1) natty; urgency=low
* Add test_bitcoin to build test * Add test_bitcoin to build test
* Fix clean * Fix clean
* Remove uneccessary build-dependancies * Remove unnecessary build-dependancies
-- Matt Corallo <matt@bluematt.me> Wed, 26 Oct 2011 14:37:18 -0400 -- Matt Corallo <matt@bluematt.me> Wed, 26 Oct 2011 14:37:18 -0400
@ -350,7 +350,7 @@ bitcoin (0.3.20.01~dfsg-1) unstable; urgency=low
bitcoin (0.3.19~dfsg-6) unstable; urgency=low bitcoin (0.3.19~dfsg-6) unstable; urgency=low
* Fix override agressive optimizations. * Fix override aggressive optimizations.
* Fix tighten build-dependencies to really fit backporting to Lenny: * Fix tighten build-dependencies to really fit backporting to Lenny:
+ Add fallback build-dependency on libdb4.6++-dev. + Add fallback build-dependency on libdb4.6++-dev.
+ Tighten unversioned Boost build-dependencies to recent versions, + Tighten unversioned Boost build-dependencies to recent versions,

2
depends/config.guess vendored

@ -1117,7 +1117,7 @@ EOF
# uname -m prints for DJGPP always 'pc', but it prints nothing about # uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586. # the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub # Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configury will decide that # prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build. # this is a cross-build.
echo i586-pc-msdosdjgpp echo i586-pc-msdosdjgpp
exit ;; exit ;;

2
qa/rpc-tests/rest.py

@ -200,7 +200,7 @@ class RESTTest (BitcoinTestFramework):
response = http_get_call(url.hostname, url.port, '/rest/getutxos'+json_request+self.FORMAT_SEPARATOR+'json', '', True) response = http_get_call(url.hostname, url.port, '/rest/getutxos'+json_request+self.FORMAT_SEPARATOR+'json', '', True)
assert_equal(response.status, 200) #must be a 500 because we exceeding the limits assert_equal(response.status, 200) #must be a 500 because we exceeding the limits
self.nodes[0].generate(1) #generate block to not affect upcomming tests self.nodes[0].generate(1) #generate block to not affect upcoming tests
self.sync_all() self.sync_all()
################ ################

2
qa/rpc-tests/test_framework/comptool.py

@ -134,7 +134,7 @@ class TestNode(NodeConnCB):
# is reached) and then sent out in one inv message. Then the final block # is reached) and then sent out in one inv message. Then the final block
# will be synced across all connections, and the outcome of the final # will be synced across all connections, and the outcome of the final
# block will be tested. # block will be tested.
# sync_every_tx: analagous to behavior for sync_every_block, except if outcome # sync_every_tx: analogous to behavior for sync_every_block, except if outcome
# on the final tx is None, then contents of entire mempool are compared # on the final tx is None, then contents of entire mempool are compared
# across all connections. (If outcome of final tx is specified as true # across all connections. (If outcome of final tx is specified as true
# or false, then only the last tx is tested against outcome.) # or false, then only the last tx is tested against outcome.)

2
src/addrman.h

@ -265,7 +265,7 @@ public:
* Notice that vvTried, mapAddr and vVector are never encoded explicitly; * Notice that vvTried, mapAddr and vVector are never encoded explicitly;
* they are instead reconstructed from the other information. * they are instead reconstructed from the other information.
* *
* vvNew is serialized, but only used if ADDRMAN_UNKOWN_BUCKET_COUNT didn't change, * vvNew is serialized, but only used if ADDRMAN_UNKNOWN_BUCKET_COUNT didn't change,
* otherwise it is reconstructed as well. * otherwise it is reconstructed as well.
* *
* This format is more complex, but significantly smaller (at most 1.5 MiB), and supports * This format is more complex, but significantly smaller (at most 1.5 MiB), and supports

2
src/main.cpp

@ -1457,7 +1457,7 @@ bool AbortNode(const std::string& strMessage, const std::string& userMessage="")
strMiscWarning = strMessage; strMiscWarning = strMessage;
LogPrintf("*** %s\n", strMessage); LogPrintf("*** %s\n", strMessage);
uiInterface.ThreadSafeMessageBox( uiInterface.ThreadSafeMessageBox(
userMessage.empty() ? _("Error: A fatal internal error occured, see debug.log for details") : userMessage, userMessage.empty() ? _("Error: A fatal internal error occurred, see debug.log for details") : userMessage,
"", CClientUIInterface::MSG_ERROR); "", CClientUIInterface::MSG_ERROR);
StartShutdown(); StartShutdown();
return false; return false;

2
src/merkleblock.cpp

@ -168,7 +168,7 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch) {
// traverse the partial tree // traverse the partial tree
unsigned int nBitsUsed = 0, nHashUsed = 0; unsigned int nBitsUsed = 0, nHashUsed = 0;
uint256 hashMerkleRoot = TraverseAndExtract(nHeight, 0, nBitsUsed, nHashUsed, vMatch); uint256 hashMerkleRoot = TraverseAndExtract(nHeight, 0, nBitsUsed, nHashUsed, vMatch);
// verify that no problems occured during the tree traversal // verify that no problems occurred during the tree traversal
if (fBad) if (fBad)
return uint256(); return uint256();
// verify that all bits were consumed (except for the padding caused by serializing it as a byte sequence) // verify that all bits were consumed (except for the padding caused by serializing it as a byte sequence)

2
src/net.cpp

@ -2319,7 +2319,7 @@ void DumpBanlist()
{ {
int64_t nStart = GetTimeMillis(); int64_t nStart = GetTimeMillis();
CNode::SweepBanned(); //clean unused entires (if bantime has expired) CNode::SweepBanned(); //clean unused entries (if bantime has expired)
CBanDB bandb; CBanDB bandb;
banmap_t banmap; banmap_t banmap;

2
src/net.h

@ -695,7 +695,7 @@ public:
static bool BannedSetIsDirty(); static bool BannedSetIsDirty();
//!set the "dirty" flag for the banlist //!set the "dirty" flag for the banlist
static void SetBannedSetDirty(bool dirty=true); static void SetBannedSetDirty(bool dirty=true);
//!clean unused entires (if bantime has expired) //!clean unused entries (if bantime has expired)
static void SweepBanned(); static void SweepBanned();
void copyStats(CNodeStats &stats); void copyStats(CNodeStats &stats);

2
src/netbase.cpp

@ -349,7 +349,7 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials
} }
if (pchRetA[0] != 0x01 || pchRetA[1] != 0x00) { if (pchRetA[0] != 0x01 || pchRetA[1] != 0x00) {
CloseSocket(hSocket); CloseSocket(hSocket);
return error("Proxy authentication unsuccesful"); return error("Proxy authentication unsuccessful");
} }
} else if (pchRet1[1] == 0x00) { } else if (pchRet1[1] == 0x00) {
// Perform no authentication // Perform no authentication

2
src/policy/fees.cpp

@ -261,7 +261,7 @@ void TxConfirmStats::removeTx(unsigned int entryHeight, unsigned int nBestSeenHe
blocksAgo = 0; blocksAgo = 0;
if (blocksAgo < 0) { if (blocksAgo < 0) {
LogPrint("estimatefee", "Blockpolicy error, blocks ago is negative for mempool tx\n"); LogPrint("estimatefee", "Blockpolicy error, blocks ago is negative for mempool tx\n");
return; //This can't happen becasue we call this with our best seen height, no entries can have higher return; //This can't happen because we call this with our best seen height, no entries can have higher
} }
if (blocksAgo >= (int)unconfTxs.size()) { if (blocksAgo >= (int)unconfTxs.size()) {

2
src/policy/fees.h

@ -118,7 +118,7 @@ public:
/** /**
* Initialize the data structures. This is called by BlockPolicyEstimator's * Initialize the data structures. This is called by BlockPolicyEstimator's
* constructor with default values. * constructor with default values.
* @param defaultBuckets contains the upper limits for the bucket boundries * @param defaultBuckets contains the upper limits for the bucket boundaries
* @param maxConfirms max number of confirms to track * @param maxConfirms max number of confirms to track
* @param decay how much to decay the historical moving average per block * @param decay how much to decay the historical moving average per block
* @param dataTypeString for logging purposes * @param dataTypeString for logging purposes

2
src/qt/paymentserver.cpp

@ -762,7 +762,7 @@ void PaymentServer::setOptionsModel(OptionsModel *optionsModel)
void PaymentServer::handlePaymentACK(const QString& paymentACKMsg) void PaymentServer::handlePaymentACK(const QString& paymentACKMsg)
{ {
// currently we don't futher process or store the paymentACK message // currently we don't further process or store the paymentACK message
Q_EMIT message(tr("Payment acknowledged"), paymentACKMsg, CClientUIInterface::ICON_INFORMATION | CClientUIInterface::MODAL); Q_EMIT message(tr("Payment acknowledged"), paymentACKMsg, CClientUIInterface::ICON_INFORMATION | CClientUIInterface::MODAL);
} }

2
src/qt/rpcconsole.cpp

@ -570,7 +570,7 @@ void RPCConsole::peerLayoutChanged()
if (detailNodeRow < 0) if (detailNodeRow < 0)
{ {
// detail node dissapeared from table (node disconnected) // detail node disappeared from table (node disconnected)
fUnselect = true; fUnselect = true;
} }
else else

2
src/qt/splashscreen.cpp

@ -57,7 +57,7 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
QPainter pixPaint(&pixmap); QPainter pixPaint(&pixmap);
pixPaint.setPen(QColor(100,100,100)); pixPaint.setPen(QColor(100,100,100));
// draw a slighly radial gradient // draw a slightly radial gradient
QRadialGradient gradient(QPoint(0,0), splashSize.width()/devicePixelRatio); QRadialGradient gradient(QPoint(0,0), splashSize.width()/devicePixelRatio);
gradient.setColorAt(0, Qt::white); gradient.setColorAt(0, Qt::white);
gradient.setColorAt(1, QColor(247,247,247)); gradient.setColorAt(1, QColor(247,247,247));

4
src/rpcserver.cpp

@ -607,7 +607,7 @@ void StartRPCThreads()
LogPrintf("No rpcpassword set - using random cookie authentication\n"); LogPrintf("No rpcpassword set - using random cookie authentication\n");
if (!GenerateAuthCookie(&strRPCUserColonPass)) { if (!GenerateAuthCookie(&strRPCUserColonPass)) {
uiInterface.ThreadSafeMessageBox( uiInterface.ThreadSafeMessageBox(
_("Error: A fatal internal error occured, see debug.log for details"), // Same message as AbortNode _("Error: A fatal internal error occurred, see debug.log for details"), // Same message as AbortNode
"", CClientUIInterface::MSG_ERROR); "", CClientUIInterface::MSG_ERROR);
StartShutdown(); StartShutdown();
return; return;
@ -671,7 +671,7 @@ void StartRPCThreads()
vEndpoints.push_back(ip::tcp::endpoint(boost::asio::ip::address_v6::any(), defaultPort)); vEndpoints.push_back(ip::tcp::endpoint(boost::asio::ip::address_v6::any(), defaultPort));
vEndpoints.push_back(ip::tcp::endpoint(boost::asio::ip::address_v4::any(), defaultPort)); vEndpoints.push_back(ip::tcp::endpoint(boost::asio::ip::address_v4::any(), defaultPort));
// Prefer making the socket dual IPv6/IPv4 instead of binding // Prefer making the socket dual IPv6/IPv4 instead of binding
// to both addresses seperately. // to both addresses separately.
bBindAny = true; bBindAny = true;
} }

2
src/sync.h

@ -16,7 +16,7 @@
//////////////////////////////////////////////// ////////////////////////////////////////////////
// // // //
// THE SIMPLE DEFINITON, EXCLUDING DEBUG CODE // // THE SIMPLE DEFINITION, EXCLUDING DEBUG CODE //
// // // //
//////////////////////////////////////////////// ////////////////////////////////////////////////

2
src/test/data/tx_invalid.json

@ -128,7 +128,7 @@
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 NOP2 1"]], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 NOP2 1"]],
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000fe64cd1d", "P2SH,CHECKLOCKTIMEVERIFY"], "0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000fe64cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
["By-time locks, with argument just beyond tx nLockTime (but within numerical boundries)"], ["By-time locks, with argument just beyond tx nLockTime (but within numerical boundaries)"],
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000001 NOP2 1"]], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000001 NOP2 1"]],
"01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"], "01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP2 1"]], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP2 1"]],

2
src/test/data/tx_valid.json

@ -197,7 +197,7 @@
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP2 1"]], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP2 1"]],
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ff64cd1d", "P2SH,CHECKLOCKTIMEVERIFY"], "0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ff64cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
["By-time locks, with argument just beyond tx nLockTime (but within numerical boundries)"], ["By-time locks, with argument just beyond tx nLockTime (but within numerical boundaries)"],
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 NOP2 1"]], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 NOP2 1"]],
"01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"], "01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP2 1"]], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP2 1"]],

2
src/wallet/rpcwallet.cpp

@ -797,7 +797,7 @@ UniValue movecmd(const UniValue& params, bool fHelp)
"4. minconf (numeric, optional, default=1) Only use funds with at least this many confirmations.\n" "4. minconf (numeric, optional, default=1) Only use funds with at least this many confirmations.\n"
"5. \"comment\" (string, optional) An optional comment, stored in the wallet only.\n" "5. \"comment\" (string, optional) An optional comment, stored in the wallet only.\n"
"\nResult:\n" "\nResult:\n"
"true|false (boolean) true if successfull.\n" "true|false (boolean) true if successful.\n"
"\nExamples:\n" "\nExamples:\n"
"\nMove 0.01 " + CURRENCY_UNIT + " from the default account to the account named tabby\n" "\nMove 0.01 " + CURRENCY_UNIT + " from the default account to the account named tabby\n"
+ HelpExampleCli("move", "\"\" \"tabby\" 0.01") + + HelpExampleCli("move", "\"\" \"tabby\" 0.01") +

Loading…
Cancel
Save