From 83d1d3a122d1731cb9040a113a525b02a1b5f9b8 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 10 Jan 2013 15:25:21 -0800 Subject: [PATCH] Some who shall remain nameless (whose first name starts with 'Art' and ends with 'hur') broke the unit tests. --- src/cpp/ripple/Config.cpp | 2 +- src/cpp/ripple/RippleAddress.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cpp/ripple/Config.cpp b/src/cpp/ripple/Config.cpp index a13e1e0e73..d10b4cb945 100644 --- a/src/cpp/ripple/Config.cpp +++ b/src/cpp/ripple/Config.cpp @@ -58,7 +58,7 @@ #define DEFAULT_FEE_OPERATION 1 Config theConfig; -const char* ALPHABET; +const char* ALPHABET = NULL; void Config::setup(const std::string& strConf, bool bTestNet, bool bQuiet) { diff --git a/src/cpp/ripple/RippleAddress.cpp b/src/cpp/ripple/RippleAddress.cpp index 6f3462ec96..93fdf7b607 100644 --- a/src/cpp/ripple/RippleAddress.cpp +++ b/src/cpp/ripple/RippleAddress.cpp @@ -750,12 +750,16 @@ bool RippleAddress::setSeed(const std::string& strSeed) return SetString(strSeed.c_str(), VER_FAMILY_SEED); } +extern const char *ALPHABET; + bool RippleAddress::setSeedGeneric(const std::string& strText) { RippleAddress naTemp; bool bResult = true; uint128 uSeed; + ALPHABET = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz"; + if (strText.empty() || naTemp.setAccountID(strText) || naTemp.setAccountPublic(strText)