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

Levelize RipplePathFind.h

Browse Source
This commit is contained in:
Edward Hennis
2015-06-25 13:59:46 -04:00
committed by Nik Bougalis
parent 1a843fb4f6
commit 7ee9f8513c
6 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Builds/VisualStudio2013/RippleD.vcxproj
View File

@@ -3220,8 +3220,6 @@
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\ripple\rpc\impl\ParseAccountIds.h"> <ClInclude Include="..\..\src\ripple\rpc\impl\ParseAccountIds.h">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\rpc\impl\RipplePathFind.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\rpc\impl\RPCHandler.cpp"> <ClCompile Include="..\..\src\ripple\rpc\impl\RPCHandler.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild> <ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile> </ClCompile>
@@ -3252,6 +3250,8 @@
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\rpc\Request.h"> <ClInclude Include="..\..\src\ripple\rpc\Request.h">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\rpc\RipplePathFind.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\rpc\RPCHandler.h"> <ClInclude Include="..\..\src\ripple\rpc\RPCHandler.h">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\rpc\RPCVersion.h"> <ClInclude Include="..\..\src\ripple\rpc\RPCVersion.h">

6
Builds/VisualStudio2013/RippleD.vcxproj.filters
View File

@@ -3933,9 +3933,6 @@
<ClInclude Include="..\..\src\ripple\rpc\impl\ParseAccountIds.h"> <ClInclude Include="..\..\src\ripple\rpc\impl\ParseAccountIds.h">
<Filter>ripple\rpc\impl</Filter> <Filter>ripple\rpc\impl</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\rpc\impl\RipplePathFind.h">
<Filter>ripple\rpc\impl</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\rpc\impl\RPCHandler.cpp"> <ClCompile Include="..\..\src\ripple\rpc\impl\RPCHandler.cpp">
<Filter>ripple\rpc\impl</Filter> <Filter>ripple\rpc\impl</Filter>
</ClCompile> </ClCompile>
@@ -3972,6 +3969,9 @@
<ClInclude Include="..\..\src\ripple\rpc\Request.h"> <ClInclude Include="..\..\src\ripple\rpc\Request.h">
<Filter>ripple\rpc</Filter> <Filter>ripple\rpc</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\rpc\RipplePathFind.h">
<Filter>ripple\rpc</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\rpc\RPCHandler.h"> <ClInclude Include="..\..\src\ripple\rpc\RPCHandler.h">
<Filter>ripple\rpc</Filter> <Filter>ripple\rpc</Filter>
</ClInclude> </ClInclude>

2
src/ripple/app/ledger/tests/common_ledger.cpp
View File

@@ -23,7 +23,7 @@
#include <ripple/protocol/RippleAddress.h> #include <ripple/protocol/RippleAddress.h>
#include <ripple/protocol/Indexes.h> #include <ripple/protocol/Indexes.h>
#include <ripple/protocol/types.h> #include <ripple/protocol/types.h>
#include <ripple/rpc/impl/RipplePathFind.h> #include <ripple/rpc/RipplePathFind.h>
#include <ripple/json/json_writer.h> #include <ripple/json/json_writer.h>
namespace ripple { namespace ripple {

2
src/ripple/app/paths/tests/Path_test.cpp
View File

@@ -22,7 +22,7 @@
#include <ripple/json/json_reader.h> #include <ripple/json/json_reader.h>
#include <ripple/json/to_string.h> #include <ripple/json/to_string.h>
#include <ripple/protocol/TxFlags.h> #include <ripple/protocol/TxFlags.h>
#include <ripple/rpc/impl/RipplePathFind.h> #include <ripple/rpc/RipplePathFind.h>
#include <ripple/basics/Log.h> #include <ripple/basics/Log.h>
#include <beast/unit_test/suite.h> #include <beast/unit_test/suite.h>

5
src/ripple/rpc/impl/RipplePathFind.h → src/ripple/rpc/RipplePathFind.h
View File

@@ -25,11 +25,6 @@
namespace ripple { namespace ripple {
class RippleAddress;
Json::Value
buildSrcCurrencies(AccountID const& raSrc, RippleLineCache::pointer const& cache);
std::pair<bool, Json::Value> std::pair<bool, Json::Value>
ripplePathFind (RippleLineCache::pointer const& cache, ripplePathFind (RippleLineCache::pointer const& cache,
AccountID const& raSrc, AccountID const& raDst, AccountID const& raSrc, AccountID const& raDst,

36
src/ripple/rpc/handlers/RipplePathFind.cpp
View File

@@ -18,7 +18,7 @@
//============================================================================== //==============================================================================
#include <BeastConfig.h> #include <BeastConfig.h>
#include <ripple/rpc/impl/RipplePathFind.h> #include <ripple/rpc/RipplePathFind.h>
#include <ripple/app/main/Application.h> #include <ripple/app/main/Application.h>
#include <ripple/app/paths/AccountCurrencies.h> #include <ripple/app/paths/AccountCurrencies.h>
#include <ripple/app/paths/FindPaths.h> #include <ripple/app/paths/FindPaths.h>
@@ -32,6 +32,24 @@
namespace ripple { namespace ripple {
static
Json::Value
buildSrcCurrencies(AccountID const& account,
RippleLineCache::pointer const& cache)
{
auto currencies = accountSourceCurrencies(account, cache, true);
auto jvSrcCurrencies = Json::Value(Json::arrayValue);
for (auto const& uCurrency : currencies)
{
Json::Value jvCurrency(Json::objectValue);
jvCurrency[jss::currency] = to_string(uCurrency);
jvSrcCurrencies.append(jvCurrency);
}
return jvSrcCurrencies;
}
// This interface is deprecated. // This interface is deprecated.
Json::Value doRipplePathFind (RPC::Context& context) Json::Value doRipplePathFind (RPC::Context& context)
{ {
@@ -196,22 +214,6 @@ Json::Value doRipplePathFind (RPC::Context& context)
return jvResult; return jvResult;
} }
Json::Value
buildSrcCurrencies(AccountID const& account, RippleLineCache::pointer const& cache)
{
auto currencies = accountSourceCurrencies(account, cache, true);
auto jvSrcCurrencies = Json::Value(Json::arrayValue);
for (auto const& uCurrency : currencies)
{
Json::Value jvCurrency(Json::objectValue);
jvCurrency[jss::currency] = to_string(uCurrency);
jvSrcCurrencies.append(jvCurrency);
}
return jvSrcCurrencies;
}
std::pair<bool, Json::Value> std::pair<bool, Json::Value>
ripplePathFind (RippleLineCache::pointer const& cache, ripplePathFind (RippleLineCache::pointer const& cache,
AccountID const& raSrc, AccountID const& raDst, AccountID const& raSrc, AccountID const& raDst,