diff --git a/include/opentxs/client/OT_ME.hpp b/include/opentxs/client/OT_ME.hpp index 15799944f0..5b30910330 100644 --- a/include/opentxs/client/OT_ME.hpp +++ b/include/opentxs/client/OT_ME.hpp @@ -208,9 +208,9 @@ class OT_ME const std::string& NYM_ID, const std::string& TARGET_NYM_ID) const; - EXPORT std::string create_pseudonym(int32_t nKeybits, - const std::string& NYM_ID_SOURCE, - const std::string& ALT_LOCATION) const; + EXPORT std::string create_nym(int32_t nKeybits, + const std::string& NYM_ID_SOURCE, + const std::string& ALT_LOCATION) const; EXPORT std::string issue_asset_type(const std::string& SERVER_ID, const std::string& NYM_ID, diff --git a/src/client/OTMeCpp.cpp b/src/client/OTMeCpp.cpp index dc15921d82..984149bafa 100644 --- a/src/client/OTMeCpp.cpp +++ b/src/client/OTMeCpp.cpp @@ -168,11 +168,11 @@ std::string OTMeCpp::check_user(const std::string& SERVER_ID, return MadeEasy::check_user(SERVER_ID, NYM_ID, TARGET_NYM_ID); } -std::string OTMeCpp::create_pseudonym(int32_t nKeybits, - const std::string& NYM_ID_SOURCE, - const std::string& ALT_LOCATION) const +std::string OTMeCpp::create_nym(int32_t nKeybits, + const std::string& NYM_ID_SOURCE, + const std::string& ALT_LOCATION) const { - return MadeEasy::create_pseudonym(nKeybits, NYM_ID_SOURCE, ALT_LOCATION); + return MadeEasy::create_nym(nKeybits, NYM_ID_SOURCE, ALT_LOCATION); } std::string OTMeCpp::issue_asset_type(const std::string& SERVER_ID, diff --git a/src/client/OTMeCpp.hpp b/src/client/OTMeCpp.hpp index 09f0752c98..7c11cad157 100644 --- a/src/client/OTMeCpp.hpp +++ b/src/client/OTMeCpp.hpp @@ -155,9 +155,8 @@ class OTMeCpp const std::string& NYM_ID, const std::string& TARGET_NYM_ID) const; - std::string create_pseudonym(int32_t nKeybits, - const std::string& NYM_ID_SOURCE, - const std::string& ALT_LOCATION) const; + std::string create_nym(int32_t nKeybits, const std::string& NYM_ID_SOURCE, + const std::string& ALT_LOCATION) const; std::string issue_asset_type(const std::string& SERVER_ID, const std::string& NYM_ID, diff --git a/src/client/OT_ME.cpp b/src/client/OT_ME.cpp index 4038a9d255..9599c1b557 100644 --- a/src/client/OT_ME.cpp +++ b/src/client/OT_ME.cpp @@ -404,15 +404,14 @@ std::string OT_ME::check_user(const std::string& SERVER_ID, return m_pImplementation->check_user(SERVER_ID, NYM_ID, TARGET_NYM_ID); } -// CREATE NYM (pseudonym) +// CREATE NYM // returns new Nym ID // -std::string OT_ME::create_pseudonym(int32_t nKeybits, - const std::string& NYM_ID_SOURCE, - const std::string& ALT_LOCATION) const +std::string OT_ME::create_nym(int32_t nKeybits, + const std::string& NYM_ID_SOURCE, + const std::string& ALT_LOCATION) const { - return m_pImplementation->create_pseudonym(nKeybits, NYM_ID_SOURCE, - ALT_LOCATION); + return m_pImplementation->create_nym(nKeybits, NYM_ID_SOURCE, ALT_LOCATION); } // ISSUE ASSET TYPE diff --git a/src/client/ot_commands_ot.cpp b/src/client/ot_commands_ot.cpp index b5ea11cc7f..0d8240918b 100644 --- a/src/client/ot_commands_ot.cpp +++ b/src/client/ot_commands_ot.cpp @@ -2390,7 +2390,7 @@ OT_COMMANDS_OT int32_t cout << "------------------------------" "------------------------------" "------\n"; - cout << " ** PSEUDONYMS (filtered by " + cout << " ** NYMS (filtered by " "serverID: " << strServerID << "): \n\n"; @@ -5297,7 +5297,7 @@ OT_COMMANDS_OT int32_t OT_Command::mainShowNyms() { cout << "------------------------------------------------------------------" "\n"; - cout << " ** PSEUDONYMS: \n\n"; + cout << " ** NYMS: \n\n"; int32_t nNymCount = OTAPI_Wrap::GetNymCount(); @@ -5494,7 +5494,7 @@ OT_COMMANDS_OT int32_t OT_Command::mainShowMint() return -1; } -// Creates a new Pseudonym and adds it to the wallet. +// Creates a new Nym and adds it to the wallet. // (And sets the display name for the new Nym, in the wallet.) // Prints the new NymID to stdout. // @@ -5506,11 +5506,11 @@ OT_COMMANDS_OT int32_t const string& strAltLocation) { string strNymID = - MadeEasy::create_pseudonym(nKeybits, strSourceForNymID, strAltLocation); + MadeEasy::create_nym(nKeybits, strSourceForNymID, strAltLocation); if (!VerifyStringVal(strNymID)) { otOut << "details_create_nym: Failed in " - "OT_ME::create_pseudonym(keybits == " << nKeybits << ")\n"; + "OT_ME::create_nym(keybits == " << nKeybits << ")\n"; return -1; } otOut << "Success creating! " << nKeybits << " keybits, new ID: "; diff --git a/src/client/ot_made_easy_ot.cpp b/src/client/ot_made_easy_ot.cpp index 4e91aaca0d..e2b5a62803 100644 --- a/src/client/ot_made_easy_ot.cpp +++ b/src/client/ot_made_easy_ot.cpp @@ -271,11 +271,11 @@ OT_MADE_EASY_OT string MadeEasy::check_user(const string& SERVER_ID, // CREATE NYM (pseudonym) // returns new Nym ID // -OT_MADE_EASY_OT string MadeEasy::create_pseudonym(int32_t nKeybits, - const string& strNymIDSource, - const string& strAltLocation) +OT_MADE_EASY_OT string MadeEasy::create_nym(int32_t nKeybits, + const string& strNymIDSource, + const string& strAltLocation) { - string strLocation = "OT_ME_create_pseudonym"; + string strLocation = "OT_ME_create_nym"; string strNymID = OTAPI_Wrap::CreateNym( nKeybits, strNymIDSource, strAltLocation); // returns new Nym ID; diff --git a/src/client/ot_made_easy_ot.hpp b/src/client/ot_made_easy_ot.hpp index d7d487e336..c582e8a3fd 100644 --- a/src/client/ot_made_easy_ot.hpp +++ b/src/client/ot_made_easy_ot.hpp @@ -176,7 +176,7 @@ class MadeEasy const std::string& quantity, const std::string& price, bool bSelling, const std::string& strLifespanInSeconds, const std::string& strStopSign, const std::string& strActivationPrice); - EXPORT OT_MADE_EASY_OT static std::string create_pseudonym( + EXPORT OT_MADE_EASY_OT static std::string create_nym( int32_t nKeybits, const std::string& strNymIDSource, const std::string& strAltLocation); EXPORT OT_MADE_EASY_OT static std::string deposit_cheque(