From 30552459dc989bdcfe228b16ac412aeedb18a65f Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Wed, 20 Mar 2019 11:05:49 -0400 Subject: [PATCH] Spelling linter --- src/blind.cpp | 2 +- src/blind.h | 4 ++-- src/issuance.h | 2 +- test/functional/feature_issuance.py | 2 +- test/functional/rpc_tweakfedpeg.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/blind.cpp b/src/blind.cpp index 26ff8044d0..5791d9faa7 100644 --- a/src/blind.cpp +++ b/src/blind.cpp @@ -96,7 +96,7 @@ bool UnblindConfidentialPair(const CKey& blinding_key, const CConfidentialValue& return false; } - // Convienience pointers to starting point of each recovered 32 byte message + // Convenience pointers to starting point of each recovered 32 byte message unsigned char *asset_type = msg; unsigned char *asset_blinder = msg+32; diff --git a/src/blind.h b/src/blind.h index b207737589..4296b70ce7 100644 --- a/src/blind.h +++ b/src/blind.h @@ -18,7 +18,7 @@ static const size_t DEFAULT_RANGEPROOF_SIZE = 2893; /* - * Unblind a pair of confidental asset and value. + * Unblind a pair of confidential asset and value. * Note that unblinded data will only be outputted if *BOTH* asset and value could be unblinded. * * blinding_key is used to create the nonce to rewind the rangeproof in conjunction with the nNonce commitment. In the case of a 0-length nNonce, the blinding key is directly used as the nonce. @@ -37,7 +37,7 @@ void BlindAsset(CConfidentialAsset& conf_asset, secp256k1_generator& asset_gen, void CreateValueCommitment(CConfidentialValue& conf_value, secp256k1_pedersen_commitment& value_commit, const unsigned char* value_blindptr, const secp256k1_generator& asset_gen, const CAmount amount); -/* Returns the number of ouputs that were successfully blinded. +/* Returns the number of outputs that were successfully blinded. * In many cases a `0` can be fixed by adding an additional output. * @param[in] input_blinding_factors - A vector of input blinding factors that will be used to create the balanced output blinding factors * @param[in] input_asset_blinding_factors - A vector of input asset blinding factors that will be used to create the balanced output blinding factors diff --git a/src/issuance.h b/src/issuance.h index e487413082..b64ec8b75a 100644 --- a/src/issuance.h +++ b/src/issuance.h @@ -20,7 +20,7 @@ void GenerateAssetEntropy(uint256& entropy, const COutPoint& prevout, const uint256& contracthash); /** - * Derive the asset from the entropy. See Definintion 19 of the confidential + * Derive the asset from the entropy. See Definition 19 of the confidential * assets paper. * * @param[out] asset The nonce used as auxiliary input to the Pedersen diff --git a/test/functional/feature_issuance.py b/test/functional/feature_issuance.py index 8e12f93cb7..7ffe8641f0 100755 --- a/test/functional/feature_issuance.py +++ b/test/functional/feature_issuance.py @@ -285,7 +285,7 @@ class IssuanceTest(BitcoinTestFramework): # Up to 5 issuances since we're making 5 outputs each time process_raw_issuance(self.nodes[0], [{"asset_amount": 7, "asset_address": nonblind_addr, "token_amount":2, "token_address":blind_addr, "blind":False}, {"asset_amount":2, "asset_address":nonblind_addr, "blind":False}]) process_raw_issuance(self.nodes[0], [{"asset_amount": 1, "asset_address": nonblind_addr, "token_amount":2, "token_address":blind_addr, "blind":False}, {"asset_amount":3, "asset_address":nonblind_addr, "blind":False}, {"asset_amount":4, "asset_address":nonblind_addr, "token_amount":5, "token_address":blind_addr, "blind":False}, {"asset_amount":6, "asset_address":nonblind_addr, "token_amount":7, "token_address":blind_addr, "blind":False}, {"asset_amount":8, "asset_address":nonblind_addr, "token_amount":9, "token_address":blind_addr, "blind":False}]) - # Default "blind" value is true, ommitting explicit argument for last + # Default "blind" value is true, omitting explicit argument for last process_raw_issuance(self.nodes[0], [{"asset_amount": 1, "asset_address": nonblind_addr, "token_amount":2, "token_address":blind_addr, "blind":True}, {"asset_amount":3, "asset_address":nonblind_addr, "blind":True}, {"asset_amount":4, "asset_address":nonblind_addr, "token_amount":5, "token_address":blind_addr, "blind":True}, {"asset_amount":6, "asset_address":nonblind_addr, "token_amount":7, "token_address":blind_addr, "blind":True}, {"asset_amount":8, "asset_address":nonblind_addr, "token_amount":9, "token_address":blind_addr}]) # Make sure contract hash is being interpreted as expected, resulting in different asset ids diff --git a/test/functional/rpc_tweakfedpeg.py b/test/functional/rpc_tweakfedpeg.py index 4d33342b5d..4d54bcfbd9 100755 --- a/test/functional/rpc_tweakfedpeg.py +++ b/test/functional/rpc_tweakfedpeg.py @@ -71,7 +71,7 @@ class TweakFedpegTest(BitcoinTestFramework): assert_equal(tweak, nontweak) - # Liquid Deamon example: + # Liquid Daemon example: assert_equal(self.nodes[2].tweakfedpegscript("0014008b1fdbaec5a82a9322af1640e871727245bce1")["script"], "745c87635b2103258857ed88024e5296436f851337451d3d68522fbb21dc5a047b965cd2f790932103ab43d77e8706a799cee3c14678574bccaca98c101217369cee987073cd2546492102ee5c8dfdf742bcc2b08386a6a3ec4b6087d39a6fd7e6f0fdeb82ecc30b11d0342102b104b6a469d8b3ccf0a671198e5f7d7010dbf2eb5587733b168f6e0d3be75760210207fc37d4877529fb0d63b1de352689627400a43f18717fa182fe0eea283bdd7921025d8724d82c61708458bc1a08ec9a7fcaf0ab6747ccf0a7d378faea07a261ab3e2102af6859d48d0a4518a4811f12adb974bbd051931e3f96f0b6ae16142c43ae6fd12102458215967f7977effc21b964bd92d870ae7eca98f343801031639150139e63ed2102cdef66bf4b5d26d0be22cabd5761970cfa84be905dc0137ad08ab634f104cb9e210297fb764f808c126f46ce0444124213bdc6a18f2904e75c9144f53bed4c19376e2103c631e77d14a5eb2fc61496ee3e9ea19d1e56e7e65a07aaa786f25ffc2921efde210270addb9011a4b41987b0848a8dc52e5442964fe5188c6a4c9320fbb9016390772103bf9aa75444d0013c46dcf10d70831b75b46a25d901fb7c6360beb2f6cac9c503210278f303dbaad1410a26d99e4dca8925fae4c90532a156c29e8ab1abf5ccaa663d210394cc0983add2dc60aa988c9faedebdc5463106184d72dd430ef24d215daf8b935f6702c00fb275522103aab896d53a8e7d6433137bbba940f9c521e085dd07e60994579b64a6d992cf79210291b7d0b1b692f8f524516ed950872e5da10fb1b808b5a526dedc6fed1cf29807210386aa9372fbab374593466bc5451dc59954e90787f08060964d95c87ef34ca5bb5368ae")