ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add hack to show currency in Json for STAmount.

Browse Source
This commit is contained in:
Arthur Britto
2012-07-10 21:38:41 -07:00
parent 0c4b739010
commit 8ae768d2a7
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Amount.cpp
View File

@@ -44,7 +44,8 @@ bool STAmount::currencyFromString(uint160& uDstCurrency, const std::string& sCur
return bSuccess;
}
std::string STAmount::getCurrencyHuman()
// XXX Broken for custom currencies?
std::string STAmount::getCurrencyHuman() const
{
std::string sCurrency;
@@ -823,6 +824,20 @@ STAmount STAmount::deserialize(SerializerIterator& it)
return ret;
}
Json::Value STAmount::getJson(int) const
{
Json::Value elem(Json::objectValue);
elem["value"] = getText();
// This is a hack, many places don't specify a currency. STAmount is used just as a value.
if (!mIsNative)
elem["currency"] = getCurrencyHuman();
return elem;
}
// For unit tests:
static STAmount serdes(const STAmount &s)
{
Serializer ser;
@@ -834,7 +849,6 @@ static STAmount serdes(const STAmount &s)
return STAmount::deserialize(sit);
}
BOOST_AUTO_TEST_SUITE(amount)
BOOST_AUTO_TEST_CASE( setValue_test )

4
src/SerializedTypes.h
View File

@@ -271,7 +271,7 @@ public:
int64 getSNValue() const;
void setSNValue(int64);
std::string getCurrencyHuman();
std::string getCurrencyHuman() const;
bool isNative() const { return mIsNative; }
bool isZero() const { return mValue == 0; }
@@ -342,6 +342,8 @@ public:
static STAmount deserialize(SerializerIterator&);
static bool currencyFromString(uint160& uDstCurrency, const std::string& sCurrency);
Json::Value getJson(int) const;
};
class STHash128 : public SerializedType