wallet: Fix typo in comments; Simplify assert

MarcoFalke · MarcoFalke · commit facd7dd3d1f9 · 2020-07-11T14:24:36.000+02:00
diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
@@ -678,7 +678,7 @@
 ["0 0x02 0x0000 0", "CHECKMULTISIGVERIFY 1", "", "OK"],
 
 ["While not really correctly DER encoded, the empty signature is allowed by"],
-["STRICTENC to provide a compact way to provide a delibrately invalid signature."],
+["STRICTENC to provide a compact way to provide a deliberately invalid signature."],
 ["0", "0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 CHECKSIG NOT", "STRICTENC", "OK"],
 ["0 0", "1 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 1 CHECKMULTISIG NOT", "STRICTENC", "OK"],
 
diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp
@@ -135,7 +135,7 @@ void DoCheck(const std::string& prv, const std::string& pub, int flags, const st
             // When the descriptor is hardened, evaluate with access to the private keys inside.
             const FlatSigningProvider& key_provider = (flags & HARDENED) ? keys_priv : keys_pub;
 
-            // Evaluate the descriptor selected by `t` in poisition `i`.
+            // Evaluate the descriptor selected by `t` in position `i`.
             FlatSigningProvider script_provider, script_provider_cached;
             std::vector<CScript> spks, spks_cached;
             DescriptorCache desc_cache;
diff --git a/src/wallet/bdb.h b/src/wallet/bdb.h
@@ -90,7 +90,7 @@ class BerkeleyEnvironment
 /** Get BerkeleyEnvironment and database filename given a wallet path. */
 std::shared_ptr<BerkeleyEnvironment> GetWalletEnv(const fs::path& wallet_path, std::string& database_filename);
 
-/** Return wheter a BDB wallet database is currently loaded. */
+/** Return whether a BDB wallet database is currently loaded. */
 bool IsBDBWalletLoaded(const fs::path& wallet_path);
 
 /** An instance of this class represents one database.
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -3141,7 +3141,7 @@ static UniValue fundrawtransaction(const JSONRPCRequest& request)
     CAmount fee;
     int change_position;
     CCoinControl coin_control;
-    // Automatically select (additional) coins. Can be overriden by options.add_inputs.
+    // Automatically select (additional) coins. Can be overridden by options.add_inputs.
     coin_control.m_add_inputs = true;
     FundTransaction(pwallet, tx, fee, change_position, request.params[1], coin_control);
 
@@ -4075,7 +4075,7 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request)
     CMutableTransaction rawTx = ConstructTransaction(request.params[0], request.params[1], request.params[2], rbf);
     CCoinControl coin_control;
     // Automatically select coins, unless at least one is manually selected. Can
-    // be overriden by options.add_inputs.
+    // be overridden by options.add_inputs.
     coin_control.m_add_inputs = rawTx.vin.size() == 0;
     FundTransaction(pwallet, rawTx, fee, change_position, request.params[3], coin_control);
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1437,8 +1437,8 @@ bool CWallet::LoadWalletFlags(uint64_t flags)
 bool CWallet::AddWalletFlags(uint64_t flags)
 {
     LOCK(cs_wallet);
-    // We should never be writing unknown onon-tolerable wallet flags
-    assert(!(((flags & KNOWN_WALLET_FLAGS) >> 32) ^ (flags >> 32)));
+    // We should never be writing unknown non-tolerable wallet flags
+    assert(((flags & KNOWN_WALLET_FLAGS) >> 32) == (flags >> 32));
     if (!WalletBatch(*database).WriteWalletFlags(flags)) {
         throw std::runtime_error(std::string(__func__) + ": writing wallet flags failed");
     }

Original file line number	Diff line number	Diff line change
`@@ -1437,8 +1437,8 @@ bool CWallet::LoadWalletFlags(uint64_t flags)`
`1437`	`1437`	`bool CWallet::AddWalletFlags(uint64_t flags)`
`1438`	`1438`	`{`
`1439`	`1439`	`LOCK(cs_wallet);`
`1440`		`- // We should never be writing unknown onon-tolerable wallet flags`
`1441`		`- assert(!(((flags & KNOWN_WALLET_FLAGS) >> 32) ^ (flags >> 32)));`
	`1440`	`+ // We should never be writing unknown non-tolerable wallet flags`
	`1441`	`+ assert(((flags & KNOWN_WALLET_FLAGS) >> 32) == (flags >> 32));`
`1442`	`1442`	`if (!WalletBatch(*database).WriteWalletFlags(flags)) {`
`1443`	`1443`	`throw std::runtime_error(std::string(__func__) + ": writing wallet flags failed");`
`1444`	`1444`	`}`