mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
partial Merge #20842: docs: consolidate typo & url fixing
BACKPORT NOTICE: missing changes in src/test/validation_tests.cpp (signet) 1112035d32ffe73a4522226c8cb2f6a5878d3ada doc: fix various typos (Ikko Ashimine) e8640849c775efcf202dbd34736fed8d61379c49 doc: Use https URLs where possible (Sawyer Billings) Pull request description: Consolidates / fixes the changes from #20762, #20836, #20810. There is no output when `test/lint/lint-all.sh` is run. Closes #20807. ACKs for top commit: MarcoFalke: ACK 1112035d32ffe73a4522226c8cb2f6a5878d3ada Tree-SHA512: 22ca824688758281a74e5ebc6a84a358142351434e34c88c6b36045d2d241ab95fd0958565fd2060f98317e62e683323b5320cc7ec13592bf340e6922294ed78
This commit is contained in:
parent
2be1604405
commit
cc169c2457
@ -2,7 +2,7 @@ commit 7b6eb33ecd88768b28c67ce5d2d68a7eed5936b6
|
|||||||
Author: fanquake <fanquake@gmail.com>
|
Author: fanquake <fanquake@gmail.com>
|
||||||
Date: Tue Aug 25 14:34:53 2020 +0800
|
Date: Tue Aug 25 14:34:53 2020 +0800
|
||||||
|
|
||||||
Remove rule that causes inadvertant header regeneration
|
Remove rule that causes inadvertent header regeneration
|
||||||
|
|
||||||
Otherwise the makefile will needlessly attempt to re-generate the
|
Otherwise the makefile will needlessly attempt to re-generate the
|
||||||
headers with gperf. This can be dropped once the upstream build is fixed.
|
headers with gperf. This can be dropped once the upstream build is fixed.
|
||||||
|
@ -31,7 +31,7 @@ bool DecodeHexBlockHeader(CBlockHeader&, const std::string& hex_header);
|
|||||||
/**
|
/**
|
||||||
* Parse a hex string into 256 bits
|
* Parse a hex string into 256 bits
|
||||||
* @param[in] strHex a hex-formatted, 64-character string
|
* @param[in] strHex a hex-formatted, 64-character string
|
||||||
* @param[out] result the result of the parasing
|
* @param[out] result the result of the parsing
|
||||||
* @returns true if successful, false if not
|
* @returns true if successful, false if not
|
||||||
*
|
*
|
||||||
* @see ParseHashV for an RPC-oriented version of this
|
* @see ParseHashV for an RPC-oriented version of this
|
||||||
|
@ -73,7 +73,7 @@ uint256 CPartialMerkleTree::CalcHash(int height, unsigned int pos, const std::ve
|
|||||||
//if we do not have this assert, we can hit a memory access violation when indexing into vTxid
|
//if we do not have this assert, we can hit a memory access violation when indexing into vTxid
|
||||||
assert(vTxid.size() != 0);
|
assert(vTxid.size() != 0);
|
||||||
if (height == 0) {
|
if (height == 0) {
|
||||||
// hash at height 0 is the txids themself
|
// hash at height 0 is the txids themselves
|
||||||
return vTxid[pos];
|
return vTxid[pos];
|
||||||
} else {
|
} else {
|
||||||
// calculate left hash
|
// calculate left hash
|
||||||
|
@ -85,7 +85,7 @@ static void RegisterMetaTypes()
|
|||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
qRegisterMetaType<WalletModel*>();
|
qRegisterMetaType<WalletModel*>();
|
||||||
#endif
|
#endif
|
||||||
// Register typedefs (see http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType)
|
// Register typedefs (see https://doc.qt.io/qt-5/qmetatype.html#qRegisterMetaType)
|
||||||
// IMPORTANT: if CAmount is no longer a typedef use the normal variant above (see https://doc.qt.io/qt-5/qmetatype.html#qRegisterMetaType-1)
|
// IMPORTANT: if CAmount is no longer a typedef use the normal variant above (see https://doc.qt.io/qt-5/qmetatype.html#qRegisterMetaType-1)
|
||||||
qRegisterMetaType<CAmount>("CAmount");
|
qRegisterMetaType<CAmount>("CAmount");
|
||||||
qRegisterMetaType<size_t>("size_t");
|
qRegisterMetaType<size_t>("size_t");
|
||||||
|
@ -129,10 +129,10 @@ void RPCNestedTests::rpcNestedTests()
|
|||||||
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo() .\n"), std::runtime_error); //invalid syntax
|
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo() .\n"), std::runtime_error); //invalid syntax
|
||||||
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo() getblockchaininfo()"), std::runtime_error); //invalid syntax
|
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo() getblockchaininfo()"), std::runtime_error); //invalid syntax
|
||||||
(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo(")); //tolerate non closing brackets if we have no arguments
|
(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo(")); //tolerate non closing brackets if we have no arguments
|
||||||
(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo()()()")); //tolerate non command brackts
|
(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo()()()")); //tolerate non command brackets
|
||||||
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo(True)"), UniValue); //invalid argument
|
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo(True)"), UniValue); //invalid argument
|
||||||
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "a(getblockchaininfo(True))"), UniValue); //method not found
|
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "a(getblockchaininfo(True))"), UniValue); //method not found
|
||||||
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest abc,,abc"), std::runtime_error); //don't tollerate empty arguments when using ,
|
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest abc,,abc"), std::runtime_error); //don't tolerate empty arguments when using ,
|
||||||
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,abc)"), std::runtime_error); //don't tollerate empty arguments when using ,
|
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,abc)"), std::runtime_error); //don't tolerate empty arguments when using ,
|
||||||
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tollerate empty arguments when using ,
|
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tolerate empty arguments when using ,
|
||||||
}
|
}
|
||||||
|
@ -153,7 +153,7 @@ WalletModel* WalletController::getOrCreateWallet(std::unique_ptr<interfaces::Wal
|
|||||||
|
|
||||||
connect(wallet_model, &WalletModel::unload, this, [this, wallet_model] {
|
connect(wallet_model, &WalletModel::unload, this, [this, wallet_model] {
|
||||||
// Defer removeAndDeleteWallet when no modal widget is active.
|
// Defer removeAndDeleteWallet when no modal widget is active.
|
||||||
// TODO: remove this workaround by removing usage of QDiallog::exec.
|
// TODO: remove this workaround by removing usage of QDialog::exec.
|
||||||
if (QApplication::activeModalWidget()) {
|
if (QApplication::activeModalWidget()) {
|
||||||
connect(qApp, &QApplication::focusWindowChanged, wallet_model, [this, wallet_model]() {
|
connect(qApp, &QApplication::focusWindowChanged, wallet_model, [this, wallet_model]() {
|
||||||
if (!QApplication::activeModalWidget()) {
|
if (!QApplication::activeModalWidget()) {
|
||||||
|
@ -37,7 +37,7 @@ public:
|
|||||||
explicit SQLiteBatch(SQLiteDatabase& database);
|
explicit SQLiteBatch(SQLiteDatabase& database);
|
||||||
~SQLiteBatch() override { Close(); }
|
~SQLiteBatch() override { Close(); }
|
||||||
|
|
||||||
/* No-op. See commeng on SQLiteDatabase::Flush */
|
/* No-op. See comment on SQLiteDatabase::Flush */
|
||||||
void Flush() override {}
|
void Flush() override {}
|
||||||
|
|
||||||
void Close() override;
|
void Close() override;
|
||||||
|
@ -487,7 +487,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
|
|||||||
uint256 checksum;
|
uint256 checksum;
|
||||||
ssValue >> checksum;
|
ssValue >> checksum;
|
||||||
if (!(checksum_valid = Hash(vchPrivKey) == checksum)) {
|
if (!(checksum_valid = Hash(vchPrivKey) == checksum)) {
|
||||||
strErr = "Error reading wallet database: Crypted key corrupt";
|
strErr = "Error reading wallet database: Encrypted key corrupt";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ class NULLDUMMYTest(BitcoinTestFramework):
|
|||||||
self.pubkey = w0.getaddressinfo(self.address)['pubkey']
|
self.pubkey = w0.getaddressinfo(self.address)['pubkey']
|
||||||
self.ms_address = wmulti.addmultisigaddress(1, [self.pubkey])['address']
|
self.ms_address = wmulti.addmultisigaddress(1, [self.pubkey])['address']
|
||||||
if not self.options.descriptors:
|
if not self.options.descriptors:
|
||||||
# Legacy wallets need to import these so that they are watched by the wallet. This is unnecssary (and does not need to be tested) for descriptor wallets
|
# Legacy wallets need to import these so that they are watched by the wallet. This is unnecessary (and does not need to be tested) for descriptor wallets
|
||||||
wmulti.importaddress(self.ms_address)
|
wmulti.importaddress(self.ms_address)
|
||||||
|
|
||||||
self.coinbase_blocks = self.nodes[0].generate(2) # block height = 2
|
self.coinbase_blocks = self.nodes[0].generate(2) # block height = 2
|
||||||
|
@ -79,7 +79,7 @@ class WalletEncryptionTest(BitcoinTestFramework):
|
|||||||
expected_time = self.mocktime + MAX_VALUE - 600
|
expected_time = self.mocktime + MAX_VALUE - 600
|
||||||
self.nodes[0].walletpassphrase(passphrase2, MAX_VALUE - 600)
|
self.nodes[0].walletpassphrase(passphrase2, MAX_VALUE - 600)
|
||||||
self.bump_mocktime(1)
|
self.bump_mocktime(1)
|
||||||
# give buffer for walletpassphrase, since it iterates over all crypted keys
|
# give buffer for walletpassphrase, since it iterates over all encrypted keys
|
||||||
expected_time_with_buffer = self.mocktime + MAX_VALUE - 600
|
expected_time_with_buffer = self.mocktime + MAX_VALUE - 600
|
||||||
actual_time = self.nodes[0].getwalletinfo()['unlocked_until']
|
actual_time = self.nodes[0].getwalletinfo()['unlocked_until']
|
||||||
assert_greater_than_or_equal(actual_time, expected_time)
|
assert_greater_than_or_equal(actual_time, expected_time)
|
||||||
|
Loading…
Reference in New Issue
Block a user