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

Updates.

Browse Source
This commit is contained in:
JoelKatz
2012-05-19 01:56:43 -07:00
parent 567ac3c846
commit ab899bb125
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/SerializedTypes.cpp
View File

@@ -282,7 +282,6 @@ STPath* STPath::construct(SerializerIterator& s, const char *name)
STPathElement element;
element.mType = STPathElement::typeOffer;
element.mNode = s.get160();
element.mCurrency = s.get160();
path.push_back(element);
break;
}
@@ -304,7 +303,7 @@ int STPath::getLength() const
break;
case STPathElement::typeOffer:
ret += 1 + 320 / 8; // type, account ID, and currency
ret += 1 + 160 / 8; // type, account ID, and currency
break;
default: throw std::runtime_error("Unknown path element");
@@ -322,19 +321,18 @@ Json::Value STPath::getJson(int) const
{
case STPathElement::typeAccount:
{
Json::Value elem(Json::objectValue);
NewcoinAddress account;
account.setAccountID(it->mNode);
ret.append(account.humanAccountID());
elem["Account"] = account.humanAccountID();
ret.append(elem);
break;
}
case STPathElement::typeOffer:
{
Json::Value elem(Json::objectValue);
NewcoinAddress account;
account.setAccountID(it->mNode);
elem["Offer"] = account.humanAccountID();
elem["Currency"] = it->mCurrency.GetHex(); // FIXME: We need a way to display currencies
elem["Offer"] = it->mNode.GetHex();
ret.append(elem);
break;
}
@@ -363,11 +361,9 @@ std::string STPath::getText() const
}
case STPathElement::typeOffer:
{
NewcoinAddress account;
account.setAccountID(it->mNode);
ret += account.humanAccountID();
ret += "/";
ret += it->mCurrency.GetHex(); // FIXME: We need a way to display currencies
ret += "Offer(";
ret += it->mNode.GetHex();
ret += ")";
break;
}
@@ -392,7 +388,6 @@ void STPath::add(Serializer& s) const
case STPathElement::typeOffer:
s.add8(STPathElement::typeOffer);
s.add160(it->mNode);
s.add160(it->mCurrency);
break;
default: throw std::runtime_error("Unknown path element");

2
src/SerializedTypes.h
View File

@@ -438,7 +438,7 @@ public:
static const int typeOffer = 2; // Claiming an offer
int mType;
uint160 mNode, mCurrency;
uint160 mNode;
};
class STPath : public SerializedType