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

Return a SerializedTransaction if the original json was a transaction.

Browse Source
This commit is contained in:
JoelKatz
2012-10-06 14:31:52 -07:00
parent 0037a94a04
commit 20a50f0f90
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/SerializedObject.cpp
View File

@@ -11,6 +11,7 @@
#include "Log.h"
#include "LedgerFormats.h"
#include "TransactionFormats.h"
#include "SerializedTransaction.h"
std::auto_ptr<SerializedType> STObject::makeDefaultObject(SerializedTypeID id, SField::ref name)
{
@@ -163,8 +164,14 @@ bool STObject::setType(const std::vector<SOElement::ptr> &type)
}
if (mData.size() != 0)
{
Log(lsTRACE) << "setType !valid leftover";
valid = false;
BOOST_FOREACH(const SerializedType& t, mData)
{
if (!t.getFName().isDiscardable())
{
Log(lsTRACE) << "setType !valid leftover: " << t.getFName().getName();
valid = false;
}
}
}
mData.swap(newData);
return valid;
@@ -1116,6 +1123,10 @@ std::auto_ptr<STObject> STObject::parseJson(const Json::Value& object, SField::r
throw std::runtime_error("Invalid field type");
}
}
if (name->fieldType == STI_TRANSACTION)
return std::auto_ptr<STObject>(new SerializedTransaction(STObject(*name, data)));
return std::auto_ptr<STObject>(new STObject(*name, data));
}