Merge branch 'book'

Conflicts:
	src/cpp/ripple/OrderBookDB.cpp
	src/cpp/ripple/OrderBookDB.h
	src/cpp/ripple/Pathfinder.cpp
This commit is contained in:
jed
2013-02-05 13:47:25 -08:00
15 changed files with 263 additions and 19 deletions

View File

@@ -2455,6 +2455,25 @@ Json::Value RPCHandler::doSubscribe(Json::Value jvRequest)
}
}
if (jvRequest.isMember("books"))
{
for (Json::Value::iterator it = jvRequest["books"].begin(); it != jvRequest["books"].end(); it++)
{
uint160 currencyOut;
STAmount::issuerFromString(currencyOut,(*it)["CurrencyOut"].asString());
uint160 issuerOut=RippleAddress::createNodePublic( (*it)["IssuerOut"].asString() ).getAccountID();
uint160 currencyIn;
STAmount::issuerFromString(currencyOut,(*it)["CurrencyIn"].asString());
uint160 issuerIn=RippleAddress::createNodePublic( (*it)["IssuerIn"].asString() ).getAccountID();
mNetOps->subBook(ispSub,currencyIn,currencyOut,issuerIn,issuerOut);
if((*it)["StateNow"].asBool())
{
}
}
}
return jvResult;
}
@@ -2552,6 +2571,21 @@ Json::Value RPCHandler::doUnsubscribe(Json::Value jvRequest)
}
}
if (jvRequest.isMember("books"))
{
for (Json::Value::iterator it = jvRequest["books"].begin(); it != jvRequest["books"].end(); it++)
{
uint160 currencyOut;
STAmount::issuerFromString(currencyOut,(*it)["CurrencyOut"].asString());
uint160 issuerOut=RippleAddress::createNodePublic( (*it)["IssuerOut"].asString() ).getAccountID();
uint160 currencyIn;
STAmount::issuerFromString(currencyOut,(*it)["CurrencyIn"].asString());
uint160 issuerIn=RippleAddress::createNodePublic( (*it)["IssuerIn"].asString() ).getAccountID();
mNetOps->unsubBook(ispSub,currencyIn,currencyOut,issuerIn,issuerOut);
}
}
return jvResult;
}