From 939f8c49defe7ce848b66f231ce7891c98be52fd Mon Sep 17 00:00:00 2001 From: Stojce Slavkovski Date: Sun, 8 Jun 2014 15:55:16 +0200 Subject: [PATCH] return balance in satoshis --- interface/src/scripting/AccountScriptingInterface.cpp | 9 +++++---- interface/src/scripting/AccountScriptingInterface.h | 6 +++--- libraries/networking/src/DataServerAccountInfo.h | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/interface/src/scripting/AccountScriptingInterface.cpp b/interface/src/scripting/AccountScriptingInterface.cpp index f09e2d0890..c7b47c7866 100644 --- a/interface/src/scripting/AccountScriptingInterface.cpp +++ b/interface/src/scripting/AccountScriptingInterface.cpp @@ -24,9 +24,9 @@ AccountScriptingInterface* AccountScriptingInterface::getInstance() { return &sharedInstance; } -qint64 AccountScriptingInterface::getBalance() { +float AccountScriptingInterface::getBalance() { AccountManager& accountManager = AccountManager::getInstance(); - return accountManager.getAccountInfo().getBalance(); + return accountManager.getAccountInfo().getBalanceInSatoshis(); } bool AccountScriptingInterface::isLoggedIn() { @@ -34,6 +34,7 @@ bool AccountScriptingInterface::isLoggedIn() { return accountManager.isLoggedIn(); } -void AccountScriptingInterface::updateBalance(qint16 newBalance) { - emit balanceChanged(newBalance); +void AccountScriptingInterface::updateBalance(qint64 newBalance) { + AccountManager& accountManager = AccountManager::getInstance(); + emit balanceChanged(accountManager.getAccountInfo().getBalanceInSatoshis()); } diff --git a/interface/src/scripting/AccountScriptingInterface.h b/interface/src/scripting/AccountScriptingInterface.h index 69d8ca4004..38ce9c1b35 100644 --- a/interface/src/scripting/AccountScriptingInterface.h +++ b/interface/src/scripting/AccountScriptingInterface.h @@ -19,13 +19,13 @@ class AccountScriptingInterface : public QObject { AccountScriptingInterface(); signals: - void balanceChanged(qint64 newBalance); + void balanceChanged(float newBalance); public slots: static AccountScriptingInterface* getInstance(); - qint64 getBalance(); + float getBalance(); bool isLoggedIn(); - void updateBalance(qint16 newBalance); + void updateBalance(qint64 newBalance); }; #endif // hifi_AccountScriptingInterface_h diff --git a/libraries/networking/src/DataServerAccountInfo.h b/libraries/networking/src/DataServerAccountInfo.h index e0209326f9..2846d2a964 100644 --- a/libraries/networking/src/DataServerAccountInfo.h +++ b/libraries/networking/src/DataServerAccountInfo.h @@ -38,6 +38,7 @@ public: void setDiscourseApiKey(const QString& discourseApiKey); qint64 getBalance() const { return _balance; } + float getBalanceInSatoshis() const { return _balance / SATOSHIS_PER_CREDIT; } void setBalance(qint64 balance); bool hasBalance() const { return _hasBalance; } void setHasBalance(bool hasBalance) { _hasBalance = hasBalance; }