From 78d9e1be94aa49c667ef4dc47a9e379dec9c91b0 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 19 Feb 2015 15:15:30 +0100 Subject: [PATCH] Renamed method. --- libweb3jsonrpc/AccountHolder.cpp | 2 +- libweb3jsonrpc/AccountHolder.h | 2 +- libweb3jsonrpc/WebThreeStubServerBase.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libweb3jsonrpc/AccountHolder.cpp b/libweb3jsonrpc/AccountHolder.cpp index e12380110..a7bdc7a68 100644 --- a/libweb3jsonrpc/AccountHolder.cpp +++ b/libweb3jsonrpc/AccountHolder.cpp @@ -50,7 +50,7 @@ vector
AccountHolder::getAllAccounts() const return accounts; } -Address const& AccountHolder::getDefaultCallAccount() const +Address const& AccountHolder::getDefaultTransactAccount() const { if (m_accounts.empty()) return ZeroAddress; diff --git a/libweb3jsonrpc/AccountHolder.h b/libweb3jsonrpc/AccountHolder.h index 939947ea2..52005b51f 100644 --- a/libweb3jsonrpc/AccountHolder.h +++ b/libweb3jsonrpc/AccountHolder.h @@ -52,7 +52,7 @@ public: bool isProxyAccount(Address const& _account) const { return m_proxyAccounts.count(_account) > 0; } Secret const& secretKey(Address const& _account) const { return m_keyPairs.at(_account).secret(); } std::vector
getAllAccounts() const; - Address const& getDefaultCallAccount() const; + Address const& getDefaultTransactAccount() const; int addProxyAccount(Address const& _account); bool removeProxyAccount(unsigned _id); diff --git a/libweb3jsonrpc/WebThreeStubServerBase.cpp b/libweb3jsonrpc/WebThreeStubServerBase.cpp index b5cc6e078..d5da8a044 100644 --- a/libweb3jsonrpc/WebThreeStubServerBase.cpp +++ b/libweb3jsonrpc/WebThreeStubServerBase.cpp @@ -330,7 +330,7 @@ std::string WebThreeStubServerBase::eth_call(Json::Value const& _json) std::string ret; TransactionSkeleton t = toTransaction(_json); if (!t.from) - t.from = m_accounts->getDefaultCallAccount(); + t.from = m_accounts->getDefaultTransactAccount(); if (!m_accounts->isRealAccount(t.from)) return ret; if (!t.gasPrice) @@ -701,7 +701,7 @@ std::string WebThreeStubServerBase::eth_transact(Json::Value const& _json) std::string ret; TransactionSkeleton t = toTransaction(_json); if (!t.from) - t.from = m_accounts->getDefaultCallAccount(); + t.from = m_accounts->getDefaultTransactAccount(); if (!t.gasPrice) t.gasPrice = 10 * dev::eth::szabo; if (!t.gas)