diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-02 18:24:08 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-02 18:24:08 +0200 |
| commit | ca2e2c2453f0110f7d32d41abe5029c2e108a0a7 (patch) | |
| tree | 2662ab474f117cd5630b3b20a0a46140220f3434 /src/common | |
| parent | cc03036e3eb614a64fe8b88ba15a36fd607c9ac4 (diff) | |
| parent | 55a8e982c0b34cd62d1ad1eb83d0683d5291f322 (diff) | |
| download | monzero-core-ca2e2c2453f0110f7d32d41abe5029c2e108a0a7.tar.gz monzero-core-ca2e2c2453f0110f7d32d41abe5029c2e108a0a7.tar.xz monzero-core-ca2e2c2453f0110f7d32d41abe5029c2e108a0a7.zip | |
Merge pull request #1627
55a8e982 moved get_account_address_from_str_or_url from libcommon to libcryptonote_core (kenshi84)
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/dns_utils.cpp | 16 | ||||
| -rw-r--r-- | src/common/dns_utils.h | 7 |
2 files changed, 0 insertions, 23 deletions
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp index 2efdcffcd..83259bc70 100644 --- a/src/common/dns_utils.cpp +++ b/src/common/dns_utils.cpp @@ -451,22 +451,6 @@ std::string get_account_address_as_str_from_url(const std::string& url, bool& dn return addresses[0]; } -bool get_account_address_from_str_or_url( - cryptonote::account_public_address& address - , bool& has_payment_id - , crypto::hash8& payment_id - , bool testnet - , const std::string& str_or_url - ) -{ - if (cryptonote::get_account_integrated_address_from_str(address, has_payment_id, payment_id, testnet, str_or_url)) - return true; - bool dnssec_valid; - std::string address_str = get_account_address_as_str_from_url(str_or_url, dnssec_valid); - return !address_str.empty() && - cryptonote::get_account_integrated_address_from_str(address, has_payment_id, payment_id, testnet, address_str); -} - } // namespace tools::dns_utils } // namespace tools diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h index 5fe1d4775..8a63a8129 100644 --- a/src/common/dns_utils.h +++ b/src/common/dns_utils.h @@ -164,13 +164,6 @@ std::string address_from_txt_record(const std::string& s); std::vector<std::string> addresses_from_url(const std::string& url, bool& dnssec_valid); std::string get_account_address_as_str_from_url(const std::string& url, bool& dnssec_valid); -bool get_account_address_from_str_or_url( - cryptonote::account_public_address& address - , bool& has_payment_id - , crypto::hash8& payment_id - , bool testnet - , const std::string& str_or_url - ); } // namespace tools::dns_utils |