mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Linter fixes
This commit is contained in:
parent
310efc3f2e
commit
3dfd7a4e9f
8 changed files with 7 additions and 13 deletions
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
#ifndef BITCOIN_ASSET_H
|
||||
#define BITCOIN_ASSET_H
|
||||
|
||||
|
|
@ -104,4 +103,4 @@ CAmount valueFor(const CAmountMap& mapValue, const CAsset& asset);
|
|||
|
||||
std::ostream& operator<<(std::ostream& out, const CAmountMap& map);
|
||||
|
||||
#endif // BITCOIN_AMOUNT_H
|
||||
#endif // BITCOIN_ASSET_H
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
// Copyright (c) 2017-2019 The Elements Core developers
|
||||
// // Distributed under the MIT software license, see the accompanying
|
||||
// // file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef BITCOIN_BLIND_H
|
||||
#define BITCOIN_BLIND_H
|
||||
|
||||
|
|
@ -78,4 +77,4 @@ int BlindTransaction(std::vector<uint256 >& input_value_blinding_factors, const
|
|||
*/
|
||||
void RawFillBlinds(CMutableTransaction& tx, std::vector<uint256>& output_value_blinds, std::vector<uint256>& output_asset_blinds, std::vector<CPubKey>& output_pubkeys);
|
||||
|
||||
#endif //BITCOIN_BLIND_H
|
||||
#endif // BITCOIN_BLIND_H
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
// Copyright (c) 2020 The Elements Core developers
|
||||
// // Distributed under the MIT software license, see the accompanying
|
||||
// // file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef BITCOIN_BLINDPSBT_H
|
||||
#define BITCOIN_BLINDPSBT_H
|
||||
|
||||
|
|
@ -57,4 +56,4 @@ bool VerifyBlindAssetProof(const uint256& asset, const std::vector<unsigned char
|
|||
BlindProofResult VerifyBlindProofs(const PSBTOutput& o);
|
||||
BlindProofResult VerifyBlindProofs(const PSBTInput& i);
|
||||
|
||||
#endif //BITCOIN_BLINDPSBT_H
|
||||
#endif // BITCOIN_BLINDPSBT_H
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
#ifndef BITCOIN_DYNAFED_H
|
||||
#define BITCOIN_DYNAFED_H
|
||||
|
||||
|
|
@ -17,4 +16,4 @@ DynaFedParamEntry ComputeNextBlockFullCurrentParameters(const CBlockIndex* pinde
|
|||
DynaFedParamEntry ComputeNextBlockCurrentParameters(const CBlockIndex* pindexPrev, const Consensus::Params& consensus);
|
||||
|
||||
|
||||
#endif // BITCOIN_DYNAFED_H
|
||||
#endif // BITCOIN_DYNAFED_H
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
// Copyright (c) 2016-2019 The Elements developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef BITCOIN_PRIMITIVES_TXWITNESS_H
|
||||
#define BITCOIN_PRIMITIVES_TXWITNESS_H
|
||||
|
||||
|
|
@ -151,4 +150,4 @@ private:
|
|||
uint256 ComputeFastMerkleRoot(const std::vector<uint256>& hashes);
|
||||
|
||||
|
||||
#endif //BITCOIN_PRIMITIVES_TXWITNESS_H
|
||||
#endif // BITCOIN_PRIMITIVES_TXWITNESS_H
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
#include <wallet/receive.h>
|
||||
#include <wallet/rpc/wallet.h>
|
||||
#include <wallet/rpc/util.h>
|
||||
#include <wallet/rpc/wallet.h>
|
||||
|
||||
#include <optional>
|
||||
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ class TestNode():
|
|||
stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL) == 0
|
||||
|
||||
if not sys.platform.startswith('linux'):
|
||||
self.log.warning("Can't profile with perf; only availabe on Linux platforms")
|
||||
self.log.warning("Can't profile with perf; only available on Linux platforms")
|
||||
return None
|
||||
|
||||
if not test_success('which perf'):
|
||||
|
|
|
|||
|
|
@ -760,7 +760,7 @@ class ImportMultiTest(BitcoinTestFramework):
|
|||
assert_equal(addr2, newaddr2)
|
||||
|
||||
# Import a multisig and make sure the keys don't go into the keypool
|
||||
self.log.info('Imported scripts with pubkeys shoud not have their pubkeys go into the keypool')
|
||||
self.log.info('Imported scripts with pubkeys should not have their pubkeys go into the keypool')
|
||||
addr1 = self.nodes[0].getnewaddress()
|
||||
addr2 = self.nodes[0].getnewaddress()
|
||||
pub1 = self.nodes[0].getaddressinfo(addr1)['pubkey']
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue