Make ALPHABET simpler.

This commit is contained in:
JoelKatz
2013-01-12 22:26:12 -08:00
parent f9e402b9c4
commit 7527437f1d
2 changed files with 3 additions and 6 deletions

View File

@@ -60,7 +60,7 @@
#define DEFAULT_FEE_OPERATION 1 #define DEFAULT_FEE_OPERATION 1
Config theConfig; Config theConfig;
const char* ALPHABET = NULL; const char* ALPHABET = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz";
void Config::setup(const std::string& strConf, bool bTestNet, bool bQuiet) void Config::setup(const std::string& strConf, bool bTestNet, bool bQuiet)
{ {
@@ -89,9 +89,8 @@ void Config::setup(const std::string& strConf, bool bTestNet, bool bQuiet)
SIGN_VALIDATION = TESTNET ? sHP_TestNetValidation : sHP_Validation; SIGN_VALIDATION = TESTNET ? sHP_TestNetValidation : sHP_Validation;
SIGN_PROPOSAL = TESTNET ? sHP_TestNetProposal : sHP_Proposal; SIGN_PROPOSAL = TESTNET ? sHP_TestNetProposal : sHP_Proposal;
ALPHABET = TESTNET if (TESTNET)
? "RPShNAF39wBUDnEGHJKLM4pQrsT7VWXYZ2bcdeCg65jkm8ofqi1tuvaxyz" ALPHABET = "RPShNAF39wBUDnEGHJKLM4pQrsT7VWXYZ2bcdeCg65jkm8ofqi1tuvaxyz";
: "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz";
if (!strConf.empty()) if (!strConf.empty())
{ {

View File

@@ -758,8 +758,6 @@ bool RippleAddress::setSeedGeneric(const std::string& strText)
bool bResult = true; bool bResult = true;
uint128 uSeed; uint128 uSeed;
ALPHABET = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz";
if (strText.empty() if (strText.empty()
|| naTemp.setAccountID(strText) || naTemp.setAccountID(strText)
|| naTemp.setAccountPublic(strText) || naTemp.setAccountPublic(strText)