Skip to content

Commit 15c533f

Browse files
committed
Address PR review comments.
1 parent 3697e6e commit 15c533f

16 files changed

Lines changed: 5963 additions & 3571 deletions

File tree

examples/normalization_demo.cpp

Lines changed: 0 additions & 262 deletions
This file was deleted.

include/bitcoin/system/have.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@
8484
/// WITH_ build symbols.
8585
/// ---------------------------------------------------------------------------
8686

87-
/// Unicode normalization is always available (embedded tables, no ICU needed).
88-
#define HAVE_ICU
89-
9087
/// vc++: There are no flags for SHANI/CRYPTO, so use custom WITH_SHA option.
9188
#if defined(HAVE_MSC) && defined(WITH_SHA)
9289
#if defined(HAVE_XCPU)

include/bitcoin/system/wallet/mnemonics/electrum.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,13 @@ class BC_API electrum
8484

8585
/// Returns true if the seed of the words has the given prefix.
8686
/// Will also match 'old', 'bip39' and 'none', as specified.
87-
/// Non-ascii words must be nfkd/lower prenormalized if HAVE_ICU undefind.
8887
static bool is_prefix(const string_list& words,
8988
seed_prefix prefix) NOEXCEPT;
9089
static bool is_prefix(const std::string& sentence,
9190
seed_prefix prefix) NOEXCEPT;
9291

9392
/// Obtain the enumerated prefix corresponding to the words.
9493
/// Returns 'old', 'bip39' or 'none' if not a valid electrum v2 seed.
95-
/// Non-ascii words must be nfkd/lower prenormalized if HAVE_ICU undefind.
9694
/// A prefix other than 'none' implies the words represent a valid seed.
9795
static seed_prefix to_prefix(const string_list& words) NOEXCEPT;
9896
static seed_prefix to_prefix(const std::string& sentence) NOEXCEPT;
@@ -135,7 +133,6 @@ class BC_API electrum
135133
/// Derive raw form "root seed" from mnemonic entropy and passphrase.
136134
/// The "root seed" is also referred to by electrum as the "master key".
137135
/// Returns null result if current prefix is 'none', 'bip39, or 'old'.
138-
/// Returns null result with non-ascii passphrase and HAVE_ICU undefind.
139136
long_hash to_seed(const std::string& passphrase="") const NOEXCEPT;
140137

141138
/// Derive hd form "root seed" from mnemonic entropy and passphrase.
@@ -144,7 +141,6 @@ class BC_API electrum
144141
/// hd_private.secret() + .chain_code() is the raw form "root seed".
145142
/// Context affects the hd form but does not affect the contained seed.
146143
/// Returns invalid result if current prefix is 'none', 'bip39, or 'old'.
147-
/// Returns invalid result with non-ascii passphrase and HAVE_ICU undefind.
148144
hd_private to_key(const std::string& passphrase="",
149145
const context& context=btc_mainnet_p2kh) const NOEXCEPT;
150146

include/bitcoin/system/wallet/mnemonics/mnemonic.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,13 @@ class BC_API mnemonic
8383

8484
/// wiki.trezor.io/recovery_seed
8585
/// Derive the "master binary seed" from the "recovery seed" and passphrase.
86-
/// Returns null result with non-ascii passphrase and HAVE_ICU undefind.
8786
long_hash to_seed(const std::string& passphrase="") const NOEXCEPT;
8887

8988
/// wiki.trezor.io/account_private_key
9089
/// Derive the "account private key" from the "master binary seed".
9190
/// This is also known as the wallet "root key" or "master private key".
9291
/// hd_private.to_public() is the "master public key".
9392
/// The "master binary seed" cannot be obtained from the key.
94-
/// Returns invalid result with non-ascii passphrase and HAVE_ICU undefind.
9593
hd_private to_key(const std::string& passphrase="",
9694
const context& context=btc_mainnet_p2kh) const NOEXCEPT;
9795

include/bitcoin/system/words/languages.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ class BC_API languages
8888
language identifier) NOEXCEPT;
8989

9090
// Normalizes ascii whitespace and attempts nfkd and case lowering.
91-
// Both nfkd and case lowering are skipped if HAVE_ICU undefined.
9291
// This is only used to improve the chance of wordlist matching.
9392
static string_list try_normalize(const string_list& words) NOEXCEPT;
9493

src/define.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,6 @@ DEFINED("HAVE_MEMORY_PRIORITY")
211211
DEFINED("HAVE_EXECUTION")
212212
#endif
213213

214-
#ifdef HAVE_ICU
215-
DEFINED("HAVE_ICU")
216-
#endif
217-
218214
// These messages are suppressed without this.
219215
#ifdef HAVE_MESSAGES
220216
DEFINED("HAVE_MESSAGES")

0 commit comments

Comments
 (0)