diff --git a/Builds/QtCreator/rippled.pro b/Builds/QtCreator/rippled.pro
index 9858ac395a..088d7a84a4 100644
--- a/Builds/QtCreator/rippled.pro
+++ b/Builds/QtCreator/rippled.pro
@@ -1,7 +1,7 @@
# Ripple protocol buffers
-PROTOS = ../../src/cpp/ripple/ripple.proto
+PROTOS = ../../modules/ripple_data/protocol/ripple.proto
PROTOS_DIR = ../../build/proto
# Google Protocol Buffers support
@@ -55,7 +55,6 @@ OTHER_FILES += \
# $$files(../../Subtrees/beast/modules/beast_core/, true)
# $$files(../../modules/*, true) \
-# $$files(../../src/cpp/ripple/*, true) \
UI_HEADERS_DIR += ../../modules/ripple_basics
diff --git a/Builds/VisualStudio2012/RippleD.props b/Builds/VisualStudio2012/RippleD.props
index 2f398635ce..50c9673224 100644
--- a/Builds/VisualStudio2012/RippleD.props
+++ b/Builds/VisualStudio2012/RippleD.props
@@ -3,7 +3,6 @@
..\..
- $(RepoDir)\src\cpp\ripple
$(RepoDir)\build\VisualStudio2012\$(Configuration).$(Platform)\
@@ -27,8 +26,5 @@
$(RepoDir)
-
- $(SrcDir)
-
\ No newline at end of file
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index c2a401321f..411a969235 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -25,6 +25,18 @@
true
true
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
true
true
@@ -151,6 +163,162 @@
true
true
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
true
true
@@ -203,6 +371,72 @@
true
true
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
true
true
@@ -217,6 +451,198 @@
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
true
true
@@ -608,432 +1034,6 @@
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
@@ -1392,6 +1392,8 @@
+
+
@@ -1412,6 +1414,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1421,7 +1448,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1512,74 +1581,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1652,23 +1653,21 @@
-
-
- Document
- protoc --cpp_out=$(RepoDir)\build\proto -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"
- $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc
- protoc --cpp_out=$(RepoDir)\build\proto -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"
- $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc
- protoc --cpp_out=$(RepoDir)\build\proto -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"
- $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc
- protoc --cpp_out=$(RepoDir)\build\proto -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"
- $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc
-
-
+
+ Document
+ protoc --cpp_out=$(RepoDir)\build\proto -I=$(RepoDir)\modules\ripple_data\protocol\ "$(RepoDir)\modules\ripple_data\protocol\%(Filename)%(Extension)"
+ protoc --cpp_out=$(RepoDir)\build\proto -I=$(RepoDir)\modules\ripple_data\protocol\ "$(RepoDir)\modules\ripple_data\protocol\%(Filename)%(Extension)"
+ protoc --cpp_out=$(RepoDir)\build\proto -I=$(RepoDir)\modules\ripple_data\protocol\ "$(RepoDir)\modules\ripple_data\protocol\%(Filename)%(Extension)"
+ protoc --cpp_out=$(RepoDir)\build\proto -I=$(RepoDir)\modules\ripple_data\protocol\ "$(RepoDir)\modules\ripple_data\protocol\%(Filename)%(Extension)"
+ $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc
+ $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc
+ $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc
+ $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc
+
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 866db09fc2..f2e96d06ef 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -97,30 +97,6 @@
{223ac5ce-c9a0-4196-9b75-4f5fbe8bfa00}
-
- {cf19fa31-c40b-4203-b497-63a8c3dcb282}
-
-
- {7c14e9df-6d8d-4ba3-b208-f89c1d0b6b30}
-
-
- {66d2d40a-72bd-41f5-9cf9-1f464a40bb04}
-
-
- {ec6b9e0e-4a92-4c06-833d-441d51b0b163}
-
-
- {d46790be-df64-4e31-b51c-ac9e95a24747}
-
-
- {7b3efe80-291a-49bc-b32e-085b5af47f98}
-
-
- {29393027-f1ed-4700-bbd1-c880091ab96b}
-
-
- {e54bae0e-09f1-483e-bcf7-fb6b17b8d561}
-
{c6a852db-1174-4bf6-a726-ebaabf595743}
@@ -133,9 +109,6 @@
{febf2e7e-f071-4a6c-9b81-68498fc8ea57}
-
- {82a6d3f3-fa01-4cc6-9730-f928e61b9929}
-
{bd48a825-192f-4d5e-9230-661fdd65f9b6}
@@ -157,6 +130,33 @@
{efccddf1-024d-41c4-b7f5-26ce2dd79f21}
+
+ {cf19fa31-c40b-4203-b497-63a8c3dcb282}
+
+
+ {29393027-f1ed-4700-bbd1-c880091ab96b}
+
+
+ {7c14e9df-6d8d-4ba3-b208-f89c1d0b6b30}
+
+
+ {66d2d40a-72bd-41f5-9cf9-1f464a40bb04}
+
+
+ {ec6b9e0e-4a92-4c06-833d-441d51b0b163}
+
+
+ {d46790be-df64-4e31-b51c-ac9e95a24747}
+
+
+ {e54bae0e-09f1-483e-bcf7-fb6b17b8d561}
+
+
+ {7b3efe80-291a-49bc-b32e-085b5af47f98}
+
+
+ {82a6d3f3-fa01-4cc6-9730-f928e61b9929}
+
@@ -534,216 +534,6 @@
[1] Ripple\ripple_client
-
- [1] Ripple\ripple_app\_misc\_consensus
-
-
- [1] Ripple\ripple_app\_misc\_consensus
-
-
- [1] Ripple\ripple_app\_main
-
-
- [1] Ripple\ripple_app\_main
-
-
- [1] Ripple\ripple_app\_main
-
-
- [1] Ripple\ripple_app\_main
-
-
- [1] Ripple\ripple_app\_main
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_network
-
-
- [1] Ripple\ripple_app\_network
-
-
- [1] Ripple\ripple_app\_peers
-
-
- [1] Ripple\ripple_app\_peers
-
-
- [1] Ripple\ripple_app\_peers
-
-
- [1] Ripple\ripple_app\_peers
-
-
- [1] Ripple\ripple_app\_peers
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
[1] Ripple\ripple_app
@@ -786,9 +576,6 @@
[1] Ripple\ripple_net\basics
-
- [1] Ripple\ripple_app\_network
-
[1] Ripple\ripple_basio\boost
@@ -906,6 +693,219 @@
[1] Ripple\ripple_app\node
+
+ [1] Ripple\ripple_app\main
+
+
+ [1] Ripple\ripple_app\main
+
+
+ [1] Ripple\ripple_app\main
+
+
+ [1] Ripple\ripple_app\main
+
+
+ [1] Ripple\ripple_app\main
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\network
+
+
+ [1] Ripple\ripple_app\network
+
+
+ [1] Ripple\ripple_app\network
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\consensus
+
+
+ [1] Ripple\ripple_app\consensus
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
@@ -1326,207 +1326,12 @@
[1] Ripple\ripple_client
-
- [1] Ripple\ripple_app\_misc\_consensus
-
-
- [1] Ripple\ripple_app\_misc\_consensus
-
-
- [1] Ripple\ripple_app\_main
-
-
- [1] Ripple\ripple_app\_main
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_network
-
-
- [1] Ripple\ripple_app\_network
-
-
- [1] Ripple\ripple_app\_peers
-
-
- [1] Ripple\ripple_app\_peers
-
-
- [1] Ripple\ripple_app\_peers
-
-
- [1] Ripple\ripple_app\_peers
-
-
- [1] Ripple\ripple_app\_peers
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_misc
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_pathing
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_rpc
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
-
- [1] Ripple\ripple_app\_shamap
-
[1] Ripple\ripple_app\basics
[1] Ripple\ripple_app\basics
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_transactions
-
-
- [1] Ripple\ripple_app\_main
-
[1] Ripple\ripple_basics\utility
@@ -1566,12 +1371,6 @@
[1] Ripple\ripple_net\basics
-
- [1] Ripple\ripple_app\_network
-
-
- [1] Ripple\ripple_app\_peers
-
[1] Ripple\ripple_basio\boost
@@ -1659,9 +1458,6 @@
[1] Ripple\ripple_app\ledger
-
- [1] Ripple\ripple_app\_main
-
[1] Ripple\ripple_core\validator
@@ -1695,9 +1491,218 @@
[1] Ripple\ripple_app\node
+
+ [1] Ripple\ripple_app\main
+
+
+ [1] Ripple\ripple_app\main
+
+
+ [1] Ripple\ripple_app\main
+
+
+ [1] Ripple\ripple_app\main
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\misc
+
+
+ [1] Ripple\ripple_app\network
+
+
+ [1] Ripple\ripple_app\network
+
+
+ [1] Ripple\ripple_app\network
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\paths
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\peers
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\rpc
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\shamap
+
+
+ [1] Ripple\ripple_app\consensus
+
+
+ [1] Ripple\ripple_app\consensus
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
+
+ [1] Ripple\ripple_app\tx
+
-
+
+ [1] Ripple\ripple_data\protocol
+
diff --git a/SConstruct b/SConstruct
index 69461f7c6f..6ada71a71b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -114,8 +114,7 @@ INCLUDE_PATHS = [
'Subtrees/leveldb',
'Subtrees/leveldb/port',
'Subtrees/leveldb/include',
- 'Subtrees/beast',
- 'src/cpp/ripple'
+ 'Subtrees/beast'
]
COMPILED_FILES = [
@@ -198,7 +197,7 @@ if OSX:
env.Append(LINKFLAGS = ['-L/usr/local/opt/openssl/lib'])
env.Append(CXXFLAGS = ['-I/usr/local/opt/openssl/include'])
-PROTO_SRCS = env.Protoc([], 'src/cpp/ripple/ripple.proto', PROTOCOUTDIR='build/proto', PROTOCPYTHONOUTDIR=None)
+PROTO_SRCS = env.Protoc([], 'modules/ripple_data/protocol/ripple.proto', PROTOCOUTDIR='build/proto', PROTOCPYTHONOUTDIR=None)
env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc')
# Only tag actual Ripple files.
diff --git a/TODO.txt b/TODO.txt
index 3b1db72dd9..81afbda54f 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,6 +5,7 @@ RIPPLE TODO
Items marked '*' can be handled by third parties.
Vinnie's Short List (Changes day to day)
+- Review boost::asio wrappers and consolidation of network code in ripple_net
- Make theConfig a SharedSingleton to prevent leak warnings
- Refactor Section code into ConfigFile
- Improved Mutex to track deadlocks
@@ -16,6 +17,10 @@ Vinnie's Short List (Changes day to day)
--------------------------------------------------------------------------------
+- Take away the "I" prefix from abstract interface classes, in both the class
+ name and the file name. It is messing up sorting in the IDE. Use "Imp" or
+ suffix for implementations.
+
- Raise the warning level and fix everything
* Restyle all the macros in ripple_ConfigSection.h
@@ -52,10 +57,6 @@ Vinnie's Short List (Changes day to day)
- Maybe rename RPCServer to RPCClientServicer
-- Take away the "I" prefix from abstract interface classes, in both the class
- name and the file name. It is messing up sorting in the IDE. Use "Imp" or
- suffix for implementations.
-
- Profile/VTune the application to identify hot spots
* Determine why rippled has a slow startup on Windows
* Improve the performance when running all unit tests on Windows
diff --git a/src/cpp/ripple/ripple_DisputedTx.cpp b/modules/ripple_app/consensus/ripple_DisputedTx.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_DisputedTx.cpp
rename to modules/ripple_app/consensus/ripple_DisputedTx.cpp
diff --git a/src/cpp/ripple/ripple_DisputedTx.h b/modules/ripple_app/consensus/ripple_DisputedTx.h
similarity index 100%
rename from src/cpp/ripple/ripple_DisputedTx.h
rename to modules/ripple_app/consensus/ripple_DisputedTx.h
diff --git a/src/cpp/ripple/ripple_LedgerConsensus.cpp b/modules/ripple_app/consensus/ripple_LedgerConsensus.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_LedgerConsensus.cpp
rename to modules/ripple_app/consensus/ripple_LedgerConsensus.cpp
diff --git a/src/cpp/ripple/ripple_LedgerConsensus.h b/modules/ripple_app/consensus/ripple_LedgerConsensus.h
similarity index 100%
rename from src/cpp/ripple/ripple_LedgerConsensus.h
rename to modules/ripple_app/consensus/ripple_LedgerConsensus.h
diff --git a/src/cpp/ripple/ParameterTable.cpp b/modules/ripple_app/main/ParameterTable.cpp
similarity index 100%
rename from src/cpp/ripple/ParameterTable.cpp
rename to modules/ripple_app/main/ParameterTable.cpp
diff --git a/src/cpp/ripple/ParameterTable.h b/modules/ripple_app/main/ParameterTable.h
similarity index 100%
rename from src/cpp/ripple/ParameterTable.h
rename to modules/ripple_app/main/ParameterTable.h
diff --git a/src/cpp/ripple/ripple_Application.cpp b/modules/ripple_app/main/ripple_Application.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Application.cpp
rename to modules/ripple_app/main/ripple_Application.cpp
diff --git a/src/cpp/ripple/ripple_Application.h b/modules/ripple_app/main/ripple_Application.h
similarity index 100%
rename from src/cpp/ripple/ripple_Application.h
rename to modules/ripple_app/main/ripple_Application.h
diff --git a/src/cpp/ripple/ripple_ILoadManager.h b/modules/ripple_app/main/ripple_ILoadManager.h
similarity index 100%
rename from src/cpp/ripple/ripple_ILoadManager.h
rename to modules/ripple_app/main/ripple_ILoadManager.h
diff --git a/src/cpp/ripple/ripple_LoadManager.cpp b/modules/ripple_app/main/ripple_LoadManager.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_LoadManager.cpp
rename to modules/ripple_app/main/ripple_LoadManager.cpp
diff --git a/src/cpp/ripple/ripple_LocalCredentials.cpp b/modules/ripple_app/main/ripple_LocalCredentials.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_LocalCredentials.cpp
rename to modules/ripple_app/main/ripple_LocalCredentials.cpp
diff --git a/src/cpp/ripple/ripple_LocalCredentials.h b/modules/ripple_app/main/ripple_LocalCredentials.h
similarity index 100%
rename from src/cpp/ripple/ripple_LocalCredentials.h
rename to modules/ripple_app/main/ripple_LocalCredentials.h
diff --git a/src/cpp/ripple/ripple_Main.cpp b/modules/ripple_app/main/ripple_Main.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Main.cpp
rename to modules/ripple_app/main/ripple_Main.cpp
diff --git a/src/cpp/ripple/NetworkOPs.cpp b/modules/ripple_app/misc/NetworkOPs.cpp
similarity index 100%
rename from src/cpp/ripple/NetworkOPs.cpp
rename to modules/ripple_app/misc/NetworkOPs.cpp
diff --git a/src/cpp/ripple/NetworkOPs.h b/modules/ripple_app/misc/NetworkOPs.h
similarity index 100%
rename from src/cpp/ripple/NetworkOPs.h
rename to modules/ripple_app/misc/NetworkOPs.h
diff --git a/src/cpp/ripple/ripple_AccountItem.cpp b/modules/ripple_app/misc/ripple_AccountItem.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_AccountItem.cpp
rename to modules/ripple_app/misc/ripple_AccountItem.cpp
diff --git a/src/cpp/ripple/ripple_AccountItem.h b/modules/ripple_app/misc/ripple_AccountItem.h
similarity index 100%
rename from src/cpp/ripple/ripple_AccountItem.h
rename to modules/ripple_app/misc/ripple_AccountItem.h
diff --git a/src/cpp/ripple/ripple_AccountItems.cpp b/modules/ripple_app/misc/ripple_AccountItems.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_AccountItems.cpp
rename to modules/ripple_app/misc/ripple_AccountItems.cpp
diff --git a/src/cpp/ripple/ripple_AccountItems.h b/modules/ripple_app/misc/ripple_AccountItems.h
similarity index 100%
rename from src/cpp/ripple/ripple_AccountItems.h
rename to modules/ripple_app/misc/ripple_AccountItems.h
diff --git a/src/cpp/ripple/ripple_AccountState.cpp b/modules/ripple_app/misc/ripple_AccountState.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_AccountState.cpp
rename to modules/ripple_app/misc/ripple_AccountState.cpp
diff --git a/src/cpp/ripple/ripple_AccountState.h b/modules/ripple_app/misc/ripple_AccountState.h
similarity index 100%
rename from src/cpp/ripple/ripple_AccountState.h
rename to modules/ripple_app/misc/ripple_AccountState.h
diff --git a/src/cpp/ripple/ripple_CanonicalTXSet.cpp b/modules/ripple_app/misc/ripple_CanonicalTXSet.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_CanonicalTXSet.cpp
rename to modules/ripple_app/misc/ripple_CanonicalTXSet.cpp
diff --git a/src/cpp/ripple/ripple_CanonicalTXSet.h b/modules/ripple_app/misc/ripple_CanonicalTXSet.h
similarity index 100%
rename from src/cpp/ripple/ripple_CanonicalTXSet.h
rename to modules/ripple_app/misc/ripple_CanonicalTXSet.h
diff --git a/src/cpp/ripple/ripple_Features.cpp b/modules/ripple_app/misc/ripple_Features.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Features.cpp
rename to modules/ripple_app/misc/ripple_Features.cpp
diff --git a/src/cpp/ripple/ripple_FeeVote.cpp b/modules/ripple_app/misc/ripple_FeeVote.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_FeeVote.cpp
rename to modules/ripple_app/misc/ripple_FeeVote.cpp
diff --git a/src/cpp/ripple/ripple_HashRouter.cpp b/modules/ripple_app/misc/ripple_HashRouter.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_HashRouter.cpp
rename to modules/ripple_app/misc/ripple_HashRouter.cpp
diff --git a/src/cpp/ripple/ripple_IFeatures.h b/modules/ripple_app/misc/ripple_IFeatures.h
similarity index 100%
rename from src/cpp/ripple/ripple_IFeatures.h
rename to modules/ripple_app/misc/ripple_IFeatures.h
diff --git a/src/cpp/ripple/ripple_IFeeVote.h b/modules/ripple_app/misc/ripple_IFeeVote.h
similarity index 100%
rename from src/cpp/ripple/ripple_IFeeVote.h
rename to modules/ripple_app/misc/ripple_IFeeVote.h
diff --git a/src/cpp/ripple/ripple_IHashRouter.h b/modules/ripple_app/misc/ripple_IHashRouter.h
similarity index 100%
rename from src/cpp/ripple/ripple_IHashRouter.h
rename to modules/ripple_app/misc/ripple_IHashRouter.h
diff --git a/src/cpp/ripple/ripple_IProofOfWorkFactory.h b/modules/ripple_app/misc/ripple_IProofOfWorkFactory.h
similarity index 100%
rename from src/cpp/ripple/ripple_IProofOfWorkFactory.h
rename to modules/ripple_app/misc/ripple_IProofOfWorkFactory.h
diff --git a/src/cpp/ripple/ripple_IValidations.h b/modules/ripple_app/misc/ripple_IValidations.h
similarity index 100%
rename from src/cpp/ripple/ripple_IValidations.h
rename to modules/ripple_app/misc/ripple_IValidations.h
diff --git a/src/cpp/ripple/ripple_InfoSub.cpp b/modules/ripple_app/misc/ripple_InfoSub.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_InfoSub.cpp
rename to modules/ripple_app/misc/ripple_InfoSub.cpp
diff --git a/src/cpp/ripple/ripple_InfoSub.h b/modules/ripple_app/misc/ripple_InfoSub.h
similarity index 100%
rename from src/cpp/ripple/ripple_InfoSub.h
rename to modules/ripple_app/misc/ripple_InfoSub.h
diff --git a/src/cpp/ripple/ripple_NicknameState.cpp b/modules/ripple_app/misc/ripple_NicknameState.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_NicknameState.cpp
rename to modules/ripple_app/misc/ripple_NicknameState.cpp
diff --git a/src/cpp/ripple/ripple_NicknameState.h b/modules/ripple_app/misc/ripple_NicknameState.h
similarity index 100%
rename from src/cpp/ripple/ripple_NicknameState.h
rename to modules/ripple_app/misc/ripple_NicknameState.h
diff --git a/src/cpp/ripple/ripple_Offer.cpp b/modules/ripple_app/misc/ripple_Offer.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Offer.cpp
rename to modules/ripple_app/misc/ripple_Offer.cpp
diff --git a/src/cpp/ripple/ripple_Offer.h b/modules/ripple_app/misc/ripple_Offer.h
similarity index 100%
rename from src/cpp/ripple/ripple_Offer.h
rename to modules/ripple_app/misc/ripple_Offer.h
diff --git a/src/cpp/ripple/ripple_OrderBook.cpp b/modules/ripple_app/misc/ripple_OrderBook.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_OrderBook.cpp
rename to modules/ripple_app/misc/ripple_OrderBook.cpp
diff --git a/src/cpp/ripple/ripple_OrderBook.h b/modules/ripple_app/misc/ripple_OrderBook.h
similarity index 100%
rename from src/cpp/ripple/ripple_OrderBook.h
rename to modules/ripple_app/misc/ripple_OrderBook.h
diff --git a/src/cpp/ripple/ripple_ProofOfWork.cpp b/modules/ripple_app/misc/ripple_ProofOfWork.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_ProofOfWork.cpp
rename to modules/ripple_app/misc/ripple_ProofOfWork.cpp
diff --git a/src/cpp/ripple/ripple_ProofOfWork.h b/modules/ripple_app/misc/ripple_ProofOfWork.h
similarity index 100%
rename from src/cpp/ripple/ripple_ProofOfWork.h
rename to modules/ripple_app/misc/ripple_ProofOfWork.h
diff --git a/src/cpp/ripple/ripple_ProofOfWorkFactory.cpp b/modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_ProofOfWorkFactory.cpp
rename to modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp
diff --git a/src/cpp/ripple/ripple_ProofOfWorkFactory.h b/modules/ripple_app/misc/ripple_ProofOfWorkFactory.h
similarity index 100%
rename from src/cpp/ripple/ripple_ProofOfWorkFactory.h
rename to modules/ripple_app/misc/ripple_ProofOfWorkFactory.h
diff --git a/src/cpp/ripple/ripple_SerializedLedger.cpp b/modules/ripple_app/misc/ripple_SerializedLedger.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SerializedLedger.cpp
rename to modules/ripple_app/misc/ripple_SerializedLedger.cpp
diff --git a/src/cpp/ripple/ripple_SerializedLedger.h b/modules/ripple_app/misc/ripple_SerializedLedger.h
similarity index 100%
rename from src/cpp/ripple/ripple_SerializedLedger.h
rename to modules/ripple_app/misc/ripple_SerializedLedger.h
diff --git a/src/cpp/ripple/ripple_SerializedTransaction.cpp b/modules/ripple_app/misc/ripple_SerializedTransaction.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SerializedTransaction.cpp
rename to modules/ripple_app/misc/ripple_SerializedTransaction.cpp
diff --git a/src/cpp/ripple/ripple_SerializedTransaction.h b/modules/ripple_app/misc/ripple_SerializedTransaction.h
similarity index 100%
rename from src/cpp/ripple/ripple_SerializedTransaction.h
rename to modules/ripple_app/misc/ripple_SerializedTransaction.h
diff --git a/src/cpp/ripple/ripple_SerializedTransactionUnitTests.cpp b/modules/ripple_app/misc/ripple_SerializedTransactionUnitTests.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SerializedTransactionUnitTests.cpp
rename to modules/ripple_app/misc/ripple_SerializedTransactionUnitTests.cpp
diff --git a/src/cpp/ripple/ripple_Validations.cpp b/modules/ripple_app/misc/ripple_Validations.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Validations.cpp
rename to modules/ripple_app/misc/ripple_Validations.cpp
diff --git a/src/cpp/ripple/WSConnection.cpp b/modules/ripple_app/network/WSConnection.cpp
similarity index 100%
rename from src/cpp/ripple/WSConnection.cpp
rename to modules/ripple_app/network/WSConnection.cpp
diff --git a/src/cpp/ripple/WSConnection.h b/modules/ripple_app/network/WSConnection.h
similarity index 100%
rename from src/cpp/ripple/WSConnection.h
rename to modules/ripple_app/network/WSConnection.h
diff --git a/src/cpp/ripple/WSDoor.cpp b/modules/ripple_app/network/WSDoor.cpp
similarity index 100%
rename from src/cpp/ripple/WSDoor.cpp
rename to modules/ripple_app/network/WSDoor.cpp
diff --git a/src/cpp/ripple/WSDoor.h b/modules/ripple_app/network/WSDoor.h
similarity index 100%
rename from src/cpp/ripple/WSDoor.h
rename to modules/ripple_app/network/WSDoor.h
diff --git a/src/cpp/ripple/ripple_WSHandler.cpp b/modules/ripple_app/network/ripple_WSHandler.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_WSHandler.cpp
rename to modules/ripple_app/network/ripple_WSHandler.cpp
diff --git a/src/cpp/ripple/ripple_WSHandler.h b/modules/ripple_app/network/ripple_WSHandler.h
similarity index 100%
rename from src/cpp/ripple/ripple_WSHandler.h
rename to modules/ripple_app/network/ripple_WSHandler.h
diff --git a/src/cpp/ripple/ripple_PathRequest.cpp b/modules/ripple_app/paths/ripple_PathRequest.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_PathRequest.cpp
rename to modules/ripple_app/paths/ripple_PathRequest.cpp
diff --git a/src/cpp/ripple/ripple_PathRequest.h b/modules/ripple_app/paths/ripple_PathRequest.h
similarity index 100%
rename from src/cpp/ripple/ripple_PathRequest.h
rename to modules/ripple_app/paths/ripple_PathRequest.h
diff --git a/src/cpp/ripple/ripple_PathState.cpp b/modules/ripple_app/paths/ripple_PathState.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_PathState.cpp
rename to modules/ripple_app/paths/ripple_PathState.cpp
diff --git a/src/cpp/ripple/ripple_PathState.h b/modules/ripple_app/paths/ripple_PathState.h
similarity index 100%
rename from src/cpp/ripple/ripple_PathState.h
rename to modules/ripple_app/paths/ripple_PathState.h
diff --git a/src/cpp/ripple/ripple_Pathfinder.cpp b/modules/ripple_app/paths/ripple_Pathfinder.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Pathfinder.cpp
rename to modules/ripple_app/paths/ripple_Pathfinder.cpp
diff --git a/src/cpp/ripple/ripple_Pathfinder.h b/modules/ripple_app/paths/ripple_Pathfinder.h
similarity index 100%
rename from src/cpp/ripple/ripple_Pathfinder.h
rename to modules/ripple_app/paths/ripple_Pathfinder.h
diff --git a/src/cpp/ripple/ripple_RippleCalc.cpp b/modules/ripple_app/paths/ripple_RippleCalc.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_RippleCalc.cpp
rename to modules/ripple_app/paths/ripple_RippleCalc.cpp
diff --git a/src/cpp/ripple/ripple_RippleCalc.h b/modules/ripple_app/paths/ripple_RippleCalc.h
similarity index 100%
rename from src/cpp/ripple/ripple_RippleCalc.h
rename to modules/ripple_app/paths/ripple_RippleCalc.h
diff --git a/src/cpp/ripple/ripple_RippleLineCache.cpp b/modules/ripple_app/paths/ripple_RippleLineCache.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_RippleLineCache.cpp
rename to modules/ripple_app/paths/ripple_RippleLineCache.cpp
diff --git a/src/cpp/ripple/ripple_RippleLineCache.h b/modules/ripple_app/paths/ripple_RippleLineCache.h
similarity index 100%
rename from src/cpp/ripple/ripple_RippleLineCache.h
rename to modules/ripple_app/paths/ripple_RippleLineCache.h
diff --git a/src/cpp/ripple/ripple_RippleState.cpp b/modules/ripple_app/paths/ripple_RippleState.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_RippleState.cpp
rename to modules/ripple_app/paths/ripple_RippleState.cpp
diff --git a/src/cpp/ripple/ripple_RippleState.h b/modules/ripple_app/paths/ripple_RippleState.h
similarity index 100%
rename from src/cpp/ripple/ripple_RippleState.h
rename to modules/ripple_app/paths/ripple_RippleState.h
diff --git a/src/cpp/ripple/Peer.h b/modules/ripple_app/peers/Peer.h
similarity index 100%
rename from src/cpp/ripple/Peer.h
rename to modules/ripple_app/peers/Peer.h
diff --git a/src/cpp/ripple/PeerDoor.cpp b/modules/ripple_app/peers/PeerDoor.cpp
similarity index 100%
rename from src/cpp/ripple/PeerDoor.cpp
rename to modules/ripple_app/peers/PeerDoor.cpp
diff --git a/src/cpp/ripple/PeerDoor.h b/modules/ripple_app/peers/PeerDoor.h
similarity index 100%
rename from src/cpp/ripple/PeerDoor.h
rename to modules/ripple_app/peers/PeerDoor.h
diff --git a/src/cpp/ripple/ripple_ClusterNodeStatus.h b/modules/ripple_app/peers/ripple_ClusterNodeStatus.h
similarity index 69%
rename from src/cpp/ripple/ripple_ClusterNodeStatus.h
rename to modules/ripple_app/peers/ripple_ClusterNodeStatus.h
index 6520e59c55..19ea7f951a 100644
--- a/src/cpp/ripple/ripple_ClusterNodeStatus.h
+++ b/modules/ripple_app/peers/ripple_ClusterNodeStatus.h
@@ -1,8 +1,11 @@
+//------------------------------------------------------------------------------
+/*
+ Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
-
-
-#ifndef RIPPLE_CLUSTERNODESTATUS_H
-#define RIPPLE_CLUSTERNODESTATUS_H
+#ifndef RIPPLE_CLUSTERNODESTATUS_H_INCLUDED
+#define RIPPLE_CLUSTERNODESTATUS_H_INCLUDED
class ClusterNodeStatus
{
@@ -11,7 +14,7 @@ public:
ClusterNodeStatus() : mLoadFee(0), mReportTime(0)
{ ; }
- ClusterNodeStatus(std::string const& name) : mNodeName(name), mLoadFee(0), mReportTime(0)
+ explicit ClusterNodeStatus(std::string const& name) : mNodeName(name), mLoadFee(0), mReportTime(0)
{ ; }
ClusterNodeStatus(const std::string& name, uint32 fee, uint32 rtime) :
diff --git a/src/cpp/ripple/ripple_IPeers.h b/modules/ripple_app/peers/ripple_IPeers.h
similarity index 100%
rename from src/cpp/ripple/ripple_IPeers.h
rename to modules/ripple_app/peers/ripple_IPeers.h
diff --git a/src/cpp/ripple/ripple_Peer.cpp b/modules/ripple_app/peers/ripple_Peer.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Peer.cpp
rename to modules/ripple_app/peers/ripple_Peer.cpp
diff --git a/src/cpp/ripple/ripple_Peer.h b/modules/ripple_app/peers/ripple_Peer.h
similarity index 100%
rename from src/cpp/ripple/ripple_Peer.h
rename to modules/ripple_app/peers/ripple_Peer.h
diff --git a/src/cpp/ripple/ripple_PeerSet.cpp b/modules/ripple_app/peers/ripple_PeerSet.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_PeerSet.cpp
rename to modules/ripple_app/peers/ripple_PeerSet.cpp
diff --git a/src/cpp/ripple/ripple_PeerSet.h b/modules/ripple_app/peers/ripple_PeerSet.h
similarity index 100%
rename from src/cpp/ripple/ripple_PeerSet.h
rename to modules/ripple_app/peers/ripple_PeerSet.h
diff --git a/src/cpp/ripple/ripple_Peers.cpp b/modules/ripple_app/peers/ripple_Peers.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Peers.cpp
rename to modules/ripple_app/peers/ripple_Peers.cpp
diff --git a/src/cpp/ripple/ripple_UniqueNodeList.cpp b/modules/ripple_app/peers/ripple_UniqueNodeList.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_UniqueNodeList.cpp
rename to modules/ripple_app/peers/ripple_UniqueNodeList.cpp
diff --git a/src/cpp/ripple/ripple_UniqueNodeList.h b/modules/ripple_app/peers/ripple_UniqueNodeList.h
similarity index 100%
rename from src/cpp/ripple/ripple_UniqueNodeList.h
rename to modules/ripple_app/peers/ripple_UniqueNodeList.h
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 992f925443..62ae426979 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -112,84 +112,84 @@ namespace ripple
#include "node/ripple_NullBackendFactory.h"
#include "node/ripple_SqliteBackendFactory.h"
-#include "src/cpp/ripple/ripple_SHAMapItem.h"
-#include "src/cpp/ripple/ripple_SHAMapNode.h"
-#include "src/cpp/ripple/ripple_SHAMapTreeNode.h"
-#include "src/cpp/ripple/ripple_SHAMapMissingNode.h"
-#include "src/cpp/ripple/ripple_SHAMapSyncFilter.h"
-#include "src/cpp/ripple/ripple_SHAMapAddNode.h"
-#include "src/cpp/ripple/ripple_SHAMap.h"
-#include "src/cpp/ripple/ripple_SerializedTransaction.h"
-#include "src/cpp/ripple/ripple_SerializedLedger.h"
-#include "src/cpp/ripple/TransactionMeta.h"
-#include "src/cpp/ripple/Transaction.h"
-#include "src/cpp/ripple/ripple_AccountState.h"
-#include "src/cpp/ripple/ripple_NicknameState.h"
+#include "shamap/ripple_SHAMapItem.h"
+#include "shamap/ripple_SHAMapNode.h"
+#include "shamap/ripple_SHAMapTreeNode.h"
+#include "shamap/ripple_SHAMapMissingNode.h"
+#include "shamap/ripple_SHAMapSyncFilter.h"
+#include "shamap/ripple_SHAMapAddNode.h"
+#include "shamap/ripple_SHAMap.h"
+#include "misc/ripple_SerializedTransaction.h"
+#include "misc/ripple_SerializedLedger.h"
+#include "tx/TransactionMeta.h"
+#include "tx/Transaction.h"
+#include "misc/ripple_AccountState.h"
+#include "misc/ripple_NicknameState.h"
#include "ledger/Ledger.h"
#include "ledger/SerializedValidation.h"
-#include "src/cpp/ripple/ripple_ILoadManager.h"
-#include "src/cpp/ripple/ripple_ProofOfWork.h"
-#include "src/cpp/ripple/ripple_InfoSub.h"
-#include "src/cpp/ripple/ripple_OrderBook.h"
-#include "src/cpp/ripple/ripple_SHAMapSyncFilters.h"
-#include "src/cpp/ripple/ripple_IFeatures.h"
-#include "src/cpp/ripple/ripple_IFeeVote.h"
-#include "src/cpp/ripple/ripple_IHashRouter.h"
-#include "src/cpp/ripple/ripple_Peer.h" // VFALCO TODO Rename to IPeer
-#include "src/cpp/ripple/ripple_IPeers.h"
-#include "src/cpp/ripple/ripple_IProofOfWorkFactory.h"
-#include "src/cpp/ripple/ripple_ClusterNodeStatus.h"
-#include "src/cpp/ripple/ripple_UniqueNodeList.h"
-#include "src/cpp/ripple/ripple_IValidations.h"
-#include "src/cpp/ripple/ripple_PeerSet.h"
+#include "main/ripple_ILoadManager.h"
+#include "misc/ripple_ProofOfWork.h"
+#include "misc/ripple_InfoSub.h"
+#include "misc/ripple_OrderBook.h"
+#include "shamap/ripple_SHAMapSyncFilters.h"
+#include "misc/ripple_IFeatures.h"
+#include "misc/ripple_IFeeVote.h"
+#include "misc/ripple_IHashRouter.h"
+#include "peers/ripple_Peer.h" // VFALCO TODO Rename to IPeer
+#include "peers/ripple_IPeers.h"
+#include "misc/ripple_IProofOfWorkFactory.h"
+#include "peers/ripple_ClusterNodeStatus.h"
+#include "peers/ripple_UniqueNodeList.h"
+#include "misc/ripple_IValidations.h"
+#include "peers/ripple_PeerSet.h"
#include "ledger/ripple_InboundLedger.h"
#include "ledger/ripple_InboundLedgers.h"
-#include "src/cpp/ripple/ripple_AccountItem.h"
-#include "src/cpp/ripple/ripple_AccountItems.h"
+#include "misc/ripple_AccountItem.h"
+#include "misc/ripple_AccountItems.h"
#include "ledger/ripple_AcceptedLedgerTx.h"
#include "ledger/ripple_AcceptedLedger.h"
#include "ledger/ripple_LedgerEntrySet.h"
-#include "src/cpp/ripple/TransactionEngine.h"
-#include "src/cpp/ripple/ripple_CanonicalTXSet.h"
+#include "tx/TransactionEngine.h"
+#include "misc/ripple_CanonicalTXSet.h"
#include "ledger/ripple_LedgerHistory.h"
#include "ledger/LedgerMaster.h"
#include "ledger/LedgerProposal.h"
-#include "src/cpp/ripple/NetworkOPs.h"
-#include "src/cpp/ripple/TransactionMaster.h"
-#include "src/cpp/ripple/ripple_LocalCredentials.h"
-#include "src/cpp/ripple/WSDoor.h"
-#include "src/cpp/ripple/ripple_Application.h"
-#include "src/cpp/ripple/RPCHandler.h"
-#include "src/cpp/ripple/TransactionQueue.h"
+#include "misc/NetworkOPs.h"
+#include "tx/TransactionMaster.h"
+#include "main/ripple_LocalCredentials.h"
+#include "network/WSDoor.h"
+#include "main/ripple_Application.h"
+#include "rpc/RPCHandler.h"
+#include "tx/TransactionQueue.h"
#include "ledger/OrderBookDB.h"
-#include "src/cpp/ripple/CallRPC.h"
-#include "src/cpp/ripple/Transactor.h"
-#include "src/cpp/ripple/ChangeTransactor.h"
-#include "src/cpp/ripple/ripple_TransactionAcquire.h"
-#include "src/cpp/ripple/ripple_DisputedTx.h"
-#include "src/cpp/ripple/ripple_LedgerConsensus.h"
+#include "rpc/CallRPC.h"
+#include "tx/Transactor.h"
+#include "tx/ChangeTransactor.h"
+#include "tx/ripple_TransactionAcquire.h"
+#include "consensus/ripple_DisputedTx.h"
+#include "consensus/ripple_LedgerConsensus.h"
#include "ledger/LedgerTiming.h"
-#include "src/cpp/ripple/ripple_Offer.h"
-#include "src/cpp/ripple/OfferCancelTransactor.h"
-#include "src/cpp/ripple/OfferCreateTransactor.h"
-#include "src/cpp/ripple/ripple_PathRequest.h"
-#include "src/cpp/ripple/ParameterTable.h"
- #include "src/cpp/ripple/ripple_RippleLineCache.h"
- #include "src/cpp/ripple/ripple_PathState.h"
- #include "src/cpp/ripple/ripple_RippleCalc.h"
-#include "src/cpp/ripple/ripple_Pathfinder.h"
-#include "src/cpp/ripple/PaymentTransactor.h"
-#include "src/cpp/ripple/PeerDoor.h"
-#include "src/cpp/ripple/RPC.h"
-#include "src/cpp/ripple/RPCErr.h"
-#include "src/cpp/ripple/RPCSub.h"
-#include "src/cpp/ripple/RegularKeySetTransactor.h"
-#include "src/cpp/ripple/ripple_RippleState.h"
-#include "src/cpp/ripple/AccountSetTransactor.h"
-#include "src/cpp/ripple/TrustSetTransactor.h"
-#include "src/cpp/ripple/WSConnection.h"
-#include "src/cpp/ripple/ripple_WSHandler.h"
-#include "src/cpp/ripple/WalletAddTransactor.h"
+#include "misc/ripple_Offer.h"
+#include "tx/OfferCancelTransactor.h"
+#include "tx/OfferCreateTransactor.h"
+#include "paths/ripple_PathRequest.h"
+#include "main/ParameterTable.h"
+ #include "paths/ripple_RippleLineCache.h"
+ #include "paths/ripple_PathState.h"
+ #include "paths/ripple_RippleCalc.h"
+#include "paths/ripple_Pathfinder.h"
+#include "tx/PaymentTransactor.h"
+#include "peers/PeerDoor.h"
+#include "rpc/RPC.h"
+#include "rpc/RPCErr.h"
+#include "rpc/RPCSub.h"
+#include "tx/RegularKeySetTransactor.h"
+#include "paths/ripple_RippleState.h"
+#include "tx/AccountSetTransactor.h"
+#include "tx/TrustSetTransactor.h"
+#include "network/WSConnection.h"
+#include "network/ripple_WSHandler.h"
+#include "tx/WalletAddTransactor.h"
#include "contracts/ripple_ScriptData.h"
#include "contracts/ripple_Contract.h"
@@ -200,7 +200,7 @@ namespace ripple
#include "basics/ripple_BuildVersion.h" // private
#include "basics/ripple_RPCServerHandler.h"
-#include "src/cpp/ripple/RPCDoor.h" // needs RPCServer
+#include "rpc/RPCDoor.h" // needs RPCServer
}
@@ -257,13 +257,13 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#include "node/ripple_SqliteBackendFactory.cpp"
#include "ledger/Ledger.cpp"
-#include "src/cpp/ripple/ripple_SHAMapDelta.cpp"
-#include "src/cpp/ripple/ripple_SHAMapNode.cpp"
-#include "src/cpp/ripple/ripple_SHAMapTreeNode.cpp"
+#include "shamap/ripple_SHAMapDelta.cpp"
+#include "shamap/ripple_SHAMapNode.cpp"
+#include "shamap/ripple_SHAMapTreeNode.cpp"
-#include "src/cpp/ripple/ripple_AccountItems.cpp"
-#include "src/cpp/ripple/ripple_AccountState.cpp"
-#include "src/cpp/ripple/ChangeTransactor.cpp"
+#include "misc/ripple_AccountItems.cpp"
+#include "misc/ripple_AccountState.cpp"
+#include "tx/ChangeTransactor.cpp"
#include "contracts/ripple_Contract.cpp"
#include "contracts/ripple_Operation.cpp"
@@ -276,19 +276,19 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 2
-#include "src/cpp/ripple/RPCHandler.cpp"
-#include "src/cpp/ripple/ripple_SHAMap.cpp" // Uses theApp
-#include "src/cpp/ripple/ripple_SHAMapItem.cpp"
-#include "src/cpp/ripple/ripple_SHAMapSync.cpp"
-#include "src/cpp/ripple/ripple_SHAMapMissingNode.cpp"
+#include "rpc/RPCHandler.cpp"
+#include "shamap/ripple_SHAMap.cpp" // Uses theApp
+#include "shamap/ripple_SHAMapItem.cpp"
+#include "shamap/ripple_SHAMapSync.cpp"
+#include "shamap/ripple_SHAMapMissingNode.cpp"
-#include "src/cpp/ripple/ripple_AccountItem.cpp"
-#include "src/cpp/ripple/AccountSetTransactor.cpp"
-#include "src/cpp/ripple/ripple_CanonicalTXSet.cpp"
+#include "misc/ripple_AccountItem.cpp"
+#include "tx/AccountSetTransactor.cpp"
+#include "misc/ripple_CanonicalTXSet.cpp"
#include "ledger/LedgerProposal.cpp"
-#include "src/cpp/ripple/ripple_LoadManager.cpp"
-#include "src/cpp/ripple/ripple_NicknameState.cpp"
-#include "src/cpp/ripple/OfferCancelTransactor.cpp"
+#include "main/ripple_LoadManager.cpp"
+#include "misc/ripple_NicknameState.cpp"
+#include "tx/OfferCancelTransactor.cpp"
#include "ledger/OrderBookDB.cpp"
#include "data/ripple_Database.cpp"
@@ -310,23 +310,23 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
return 512 == iKeyLength ? getApp().getLocalCredentials ().getDh512 () : getApp().getLocalCredentials ().getDh1024 ();
}
-#include "src/cpp/ripple/ripple_RippleCalc.cpp"
-#include "src/cpp/ripple/CallRPC.cpp"
-#include "src/cpp/ripple/ripple_PathState.cpp"
+#include "paths/ripple_RippleCalc.cpp"
+#include "paths/ripple_PathState.cpp"
+#include "rpc/CallRPC.cpp"
-#include "src/cpp/ripple/ParameterTable.cpp"
-#include "src/cpp/ripple/PeerDoor.cpp"
-#include "src/cpp/ripple/ripple_RippleLineCache.cpp"
-#include "src/cpp/ripple/rpc.cpp"
-#include "src/cpp/ripple/RPCErr.cpp"
-#include "src/cpp/ripple/RPCSub.cpp"
+#include "main/ParameterTable.cpp"
+#include "peers/PeerDoor.cpp"
+#include "paths/ripple_RippleLineCache.cpp"
+#include "rpc/rpc.cpp"
+#include "rpc/RPCErr.cpp"
+#include "rpc/RPCSub.cpp"
#include "ledger/SerializedValidation.cpp"
-#include "src/cpp/ripple/Transaction.cpp"
-#include "src/cpp/ripple/TransactionEngine.cpp"
-#include "src/cpp/ripple/TransactionMeta.cpp"
-#include "src/cpp/ripple/Transactor.cpp"
-#include "src/cpp/ripple/WSConnection.cpp"
-#include "src/cpp/ripple/WSDoor.cpp"
+#include "tx/Transaction.cpp"
+#include "tx/TransactionEngine.cpp"
+#include "tx/TransactionMeta.cpp"
+#include "tx/Transactor.cpp"
+#include "network/WSConnection.cpp"
+#include "network/WSDoor.cpp"
#endif
@@ -334,18 +334,18 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 4
-#include "src/cpp/ripple/ripple_UniqueNodeList.cpp"
+#include "peers/ripple_UniqueNodeList.cpp"
#include "ledger/ripple_InboundLedger.cpp"
-#include "src/cpp/ripple/PaymentTransactor.cpp"
-#include "src/cpp/ripple/RegularKeySetTransactor.cpp"
-#include "src/cpp/ripple/ripple_RippleState.cpp"
-#include "src/cpp/ripple/RPCDoor.cpp"
-#include "src/cpp/ripple/TransactionCheck.cpp"
-#include "src/cpp/ripple/TransactionMaster.cpp"
-#include "src/cpp/ripple/TransactionQueue.cpp"
-#include "src/cpp/ripple/TrustSetTransactor.cpp"
-#include "src/cpp/ripple/ripple_WSHandler.cpp"
+#include "tx/PaymentTransactor.cpp"
+#include "tx/RegularKeySetTransactor.cpp"
+#include "paths/ripple_RippleState.cpp"
+#include "rpc/RPCDoor.cpp"
+#include "tx/TransactionCheck.cpp"
+#include "tx/TransactionMaster.cpp"
+#include "tx/TransactionQueue.cpp"
+#include "tx/TrustSetTransactor.cpp"
+#include "network/ripple_WSHandler.cpp"
#endif
@@ -353,14 +353,14 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 5
-#include "src/cpp/ripple/ripple_Peer.cpp"
-#include "src/cpp/ripple/ripple_Application.cpp"
-#include "src/cpp/ripple/OfferCreateTransactor.cpp"
-#include "src/cpp/ripple/ripple_Validations.cpp"
+#include "peers/ripple_Peer.cpp"
+#include "main/ripple_Application.cpp"
+#include "tx/OfferCreateTransactor.cpp"
+#include "misc/ripple_Validations.cpp"
-#include "src/cpp/ripple/WalletAddTransactor.cpp"
+#include "tx/WalletAddTransactor.cpp"
#include "ledger/ripple_AcceptedLedgerTx.cpp"
-#include "src/cpp/ripple/ripple_FeeVote.cpp"
+#include "misc/ripple_FeeVote.cpp"
#include "ledger/LedgerTiming.cpp"
#endif
@@ -370,15 +370,15 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 6
#include "ledger/ripple_LedgerEntrySet.cpp"
-#include "src/cpp/ripple/ripple_Pathfinder.cpp"
-#include "src/cpp/ripple/ripple_Features.cpp"
+#include "paths/ripple_Pathfinder.cpp"
+#include "misc/ripple_Features.cpp"
-#include "src/cpp/ripple/ripple_LocalCredentials.cpp"
+#include "main/ripple_LocalCredentials.cpp"
#include "ledger/ripple_AcceptedLedger.cpp"
-#include "src/cpp/ripple/ripple_DisputedTx.cpp"
-#include "src/cpp/ripple/ripple_HashRouter.cpp"
-#include "src/cpp/ripple/ripple_Main.cpp"
-#include "src/cpp/ripple/ripple_Offer.cpp"
+#include "consensus/ripple_DisputedTx.cpp"
+#include "misc/ripple_HashRouter.cpp"
+#include "main/ripple_Main.cpp"
+#include "misc/ripple_Offer.cpp"
#endif
@@ -386,14 +386,14 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 7
-#include "src/cpp/ripple/NetworkOPs.cpp"
-#include "src/cpp/ripple/ripple_Peers.cpp"
+#include "misc/NetworkOPs.cpp"
+#include "peers/ripple_Peers.cpp"
#include "ledger/ripple_InboundLedgers.cpp"
#include "ledger/ripple_LedgerHistory.cpp"
-#include "src/cpp/ripple/ripple_PathRequest.cpp"
-#include "src/cpp/ripple/ripple_SerializedLedger.cpp"
-#include "src/cpp/ripple/ripple_TransactionAcquire.cpp"
+#include "paths/ripple_PathRequest.cpp"
+#include "misc/ripple_SerializedLedger.cpp"
+#include "tx/ripple_TransactionAcquire.cpp"
#endif
@@ -401,18 +401,17 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 8
-#include "src/cpp/ripple/ripple_LedgerConsensus.cpp"
+#include "consensus/ripple_LedgerConsensus.cpp"
#include "ledger/LedgerMaster.cpp"
+#include "peers/ripple_PeerSet.cpp"
+#include "misc/ripple_InfoSub.cpp"
+#include "misc/ripple_OrderBook.cpp"
+#include "misc/ripple_ProofOfWork.cpp"
+#include "misc/ripple_ProofOfWorkFactory.h" // private
+#include "misc/ripple_ProofOfWorkFactory.cpp" // requires ProofOfWork.cpp for ProofOfWork::sMaxDifficulty
+#include "misc/ripple_SerializedTransaction.cpp"
-#include "src/cpp/ripple/ripple_InfoSub.cpp"
-#include "src/cpp/ripple/ripple_OrderBook.cpp"
-#include "src/cpp/ripple/ripple_PeerSet.cpp"
-#include "src/cpp/ripple/ripple_ProofOfWork.cpp"
-#include "src/cpp/ripple/ripple_ProofOfWorkFactory.h" // private
-#include "src/cpp/ripple/ripple_ProofOfWorkFactory.cpp" // requires ProofOfWork.cpp for ProofOfWork::sMaxDifficulty
-#include "src/cpp/ripple/ripple_SerializedTransaction.cpp"
-
-#include "src/cpp/ripple/ripple_SHAMapSyncFilters.cpp" // requires Application
+#include "shamap/ripple_SHAMapSyncFilters.cpp" // requires Application
#endif
@@ -431,9 +430,9 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
// VFALCO TODO Eliminate the need for boost for unit tests.
//
#include "ledger/LedgerUnitTests.cpp"
-#include "src/cpp/ripple/ripple_SHAMapUnitTests.cpp"
-#include "src/cpp/ripple/ripple_SHAMapSyncUnitTests.cpp"
-#include "src/cpp/ripple/ripple_SerializedTransactionUnitTests.cpp"
+#include "shamap/ripple_SHAMapUnitTests.cpp"
+#include "shamap/ripple_SHAMapSyncUnitTests.cpp"
+#include "misc/ripple_SerializedTransactionUnitTests.cpp"
//------------------------------------------------------------------------------
diff --git a/src/cpp/ripple/CallRPC.cpp b/modules/ripple_app/rpc/CallRPC.cpp
similarity index 100%
rename from src/cpp/ripple/CallRPC.cpp
rename to modules/ripple_app/rpc/CallRPC.cpp
diff --git a/src/cpp/ripple/CallRPC.h b/modules/ripple_app/rpc/CallRPC.h
similarity index 100%
rename from src/cpp/ripple/CallRPC.h
rename to modules/ripple_app/rpc/CallRPC.h
diff --git a/src/cpp/ripple/RPC.h b/modules/ripple_app/rpc/RPC.h
similarity index 100%
rename from src/cpp/ripple/RPC.h
rename to modules/ripple_app/rpc/RPC.h
diff --git a/src/cpp/ripple/RPCDoor.cpp b/modules/ripple_app/rpc/RPCDoor.cpp
similarity index 100%
rename from src/cpp/ripple/RPCDoor.cpp
rename to modules/ripple_app/rpc/RPCDoor.cpp
diff --git a/src/cpp/ripple/RPCDoor.h b/modules/ripple_app/rpc/RPCDoor.h
similarity index 100%
rename from src/cpp/ripple/RPCDoor.h
rename to modules/ripple_app/rpc/RPCDoor.h
diff --git a/src/cpp/ripple/RPCErr.cpp b/modules/ripple_app/rpc/RPCErr.cpp
similarity index 100%
rename from src/cpp/ripple/RPCErr.cpp
rename to modules/ripple_app/rpc/RPCErr.cpp
diff --git a/src/cpp/ripple/RPCErr.h b/modules/ripple_app/rpc/RPCErr.h
similarity index 100%
rename from src/cpp/ripple/RPCErr.h
rename to modules/ripple_app/rpc/RPCErr.h
diff --git a/src/cpp/ripple/RPCHandler.cpp b/modules/ripple_app/rpc/RPCHandler.cpp
similarity index 100%
rename from src/cpp/ripple/RPCHandler.cpp
rename to modules/ripple_app/rpc/RPCHandler.cpp
diff --git a/src/cpp/ripple/RPCHandler.h b/modules/ripple_app/rpc/RPCHandler.h
similarity index 100%
rename from src/cpp/ripple/RPCHandler.h
rename to modules/ripple_app/rpc/RPCHandler.h
diff --git a/src/cpp/ripple/RPCSub.cpp b/modules/ripple_app/rpc/RPCSub.cpp
similarity index 100%
rename from src/cpp/ripple/RPCSub.cpp
rename to modules/ripple_app/rpc/RPCSub.cpp
diff --git a/src/cpp/ripple/RPCSub.h b/modules/ripple_app/rpc/RPCSub.h
similarity index 100%
rename from src/cpp/ripple/RPCSub.h
rename to modules/ripple_app/rpc/RPCSub.h
diff --git a/src/cpp/ripple/rpc.cpp b/modules/ripple_app/rpc/rpc.cpp
similarity index 100%
rename from src/cpp/ripple/rpc.cpp
rename to modules/ripple_app/rpc/rpc.cpp
diff --git a/src/cpp/ripple/ripple_SHAMap.cpp b/modules/ripple_app/shamap/ripple_SHAMap.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMap.cpp
rename to modules/ripple_app/shamap/ripple_SHAMap.cpp
diff --git a/src/cpp/ripple/ripple_SHAMap.h b/modules/ripple_app/shamap/ripple_SHAMap.h
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMap.h
rename to modules/ripple_app/shamap/ripple_SHAMap.h
diff --git a/src/cpp/ripple/ripple_SHAMapAddNode.h b/modules/ripple_app/shamap/ripple_SHAMapAddNode.h
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapAddNode.h
rename to modules/ripple_app/shamap/ripple_SHAMapAddNode.h
diff --git a/src/cpp/ripple/ripple_SHAMapDelta.cpp b/modules/ripple_app/shamap/ripple_SHAMapDelta.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapDelta.cpp
rename to modules/ripple_app/shamap/ripple_SHAMapDelta.cpp
diff --git a/src/cpp/ripple/ripple_SHAMapItem.cpp b/modules/ripple_app/shamap/ripple_SHAMapItem.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapItem.cpp
rename to modules/ripple_app/shamap/ripple_SHAMapItem.cpp
diff --git a/src/cpp/ripple/ripple_SHAMapItem.h b/modules/ripple_app/shamap/ripple_SHAMapItem.h
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapItem.h
rename to modules/ripple_app/shamap/ripple_SHAMapItem.h
diff --git a/src/cpp/ripple/ripple_SHAMapMissingNode.cpp b/modules/ripple_app/shamap/ripple_SHAMapMissingNode.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapMissingNode.cpp
rename to modules/ripple_app/shamap/ripple_SHAMapMissingNode.cpp
diff --git a/src/cpp/ripple/ripple_SHAMapMissingNode.h b/modules/ripple_app/shamap/ripple_SHAMapMissingNode.h
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapMissingNode.h
rename to modules/ripple_app/shamap/ripple_SHAMapMissingNode.h
diff --git a/src/cpp/ripple/ripple_SHAMapNode.cpp b/modules/ripple_app/shamap/ripple_SHAMapNode.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapNode.cpp
rename to modules/ripple_app/shamap/ripple_SHAMapNode.cpp
diff --git a/src/cpp/ripple/ripple_SHAMapNode.h b/modules/ripple_app/shamap/ripple_SHAMapNode.h
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapNode.h
rename to modules/ripple_app/shamap/ripple_SHAMapNode.h
diff --git a/src/cpp/ripple/ripple_SHAMapSync.cpp b/modules/ripple_app/shamap/ripple_SHAMapSync.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapSync.cpp
rename to modules/ripple_app/shamap/ripple_SHAMapSync.cpp
diff --git a/src/cpp/ripple/ripple_SHAMapSyncFilter.h b/modules/ripple_app/shamap/ripple_SHAMapSyncFilter.h
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapSyncFilter.h
rename to modules/ripple_app/shamap/ripple_SHAMapSyncFilter.h
diff --git a/src/cpp/ripple/ripple_SHAMapSyncFilters.cpp b/modules/ripple_app/shamap/ripple_SHAMapSyncFilters.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapSyncFilters.cpp
rename to modules/ripple_app/shamap/ripple_SHAMapSyncFilters.cpp
diff --git a/src/cpp/ripple/ripple_SHAMapSyncFilters.h b/modules/ripple_app/shamap/ripple_SHAMapSyncFilters.h
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapSyncFilters.h
rename to modules/ripple_app/shamap/ripple_SHAMapSyncFilters.h
diff --git a/src/cpp/ripple/ripple_SHAMapSyncUnitTests.cpp b/modules/ripple_app/shamap/ripple_SHAMapSyncUnitTests.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapSyncUnitTests.cpp
rename to modules/ripple_app/shamap/ripple_SHAMapSyncUnitTests.cpp
diff --git a/src/cpp/ripple/ripple_SHAMapTreeNode.cpp b/modules/ripple_app/shamap/ripple_SHAMapTreeNode.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapTreeNode.cpp
rename to modules/ripple_app/shamap/ripple_SHAMapTreeNode.cpp
diff --git a/src/cpp/ripple/ripple_SHAMapTreeNode.h b/modules/ripple_app/shamap/ripple_SHAMapTreeNode.h
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapTreeNode.h
rename to modules/ripple_app/shamap/ripple_SHAMapTreeNode.h
diff --git a/src/cpp/ripple/ripple_SHAMapUnitTests.cpp b/modules/ripple_app/shamap/ripple_SHAMapUnitTests.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SHAMapUnitTests.cpp
rename to modules/ripple_app/shamap/ripple_SHAMapUnitTests.cpp
diff --git a/src/cpp/ripple/AccountSetTransactor.cpp b/modules/ripple_app/tx/AccountSetTransactor.cpp
similarity index 100%
rename from src/cpp/ripple/AccountSetTransactor.cpp
rename to modules/ripple_app/tx/AccountSetTransactor.cpp
diff --git a/src/cpp/ripple/AccountSetTransactor.h b/modules/ripple_app/tx/AccountSetTransactor.h
similarity index 100%
rename from src/cpp/ripple/AccountSetTransactor.h
rename to modules/ripple_app/tx/AccountSetTransactor.h
diff --git a/src/cpp/ripple/ChangeTransactor.cpp b/modules/ripple_app/tx/ChangeTransactor.cpp
similarity index 100%
rename from src/cpp/ripple/ChangeTransactor.cpp
rename to modules/ripple_app/tx/ChangeTransactor.cpp
diff --git a/src/cpp/ripple/ChangeTransactor.h b/modules/ripple_app/tx/ChangeTransactor.h
similarity index 100%
rename from src/cpp/ripple/ChangeTransactor.h
rename to modules/ripple_app/tx/ChangeTransactor.h
diff --git a/src/cpp/ripple/OfferCancelTransactor.cpp b/modules/ripple_app/tx/OfferCancelTransactor.cpp
similarity index 100%
rename from src/cpp/ripple/OfferCancelTransactor.cpp
rename to modules/ripple_app/tx/OfferCancelTransactor.cpp
diff --git a/src/cpp/ripple/OfferCancelTransactor.h b/modules/ripple_app/tx/OfferCancelTransactor.h
similarity index 100%
rename from src/cpp/ripple/OfferCancelTransactor.h
rename to modules/ripple_app/tx/OfferCancelTransactor.h
diff --git a/src/cpp/ripple/OfferCreateTransactor.cpp b/modules/ripple_app/tx/OfferCreateTransactor.cpp
similarity index 100%
rename from src/cpp/ripple/OfferCreateTransactor.cpp
rename to modules/ripple_app/tx/OfferCreateTransactor.cpp
diff --git a/src/cpp/ripple/OfferCreateTransactor.h b/modules/ripple_app/tx/OfferCreateTransactor.h
similarity index 100%
rename from src/cpp/ripple/OfferCreateTransactor.h
rename to modules/ripple_app/tx/OfferCreateTransactor.h
diff --git a/src/cpp/ripple/PaymentTransactor.cpp b/modules/ripple_app/tx/PaymentTransactor.cpp
similarity index 100%
rename from src/cpp/ripple/PaymentTransactor.cpp
rename to modules/ripple_app/tx/PaymentTransactor.cpp
diff --git a/src/cpp/ripple/PaymentTransactor.h b/modules/ripple_app/tx/PaymentTransactor.h
similarity index 100%
rename from src/cpp/ripple/PaymentTransactor.h
rename to modules/ripple_app/tx/PaymentTransactor.h
diff --git a/src/cpp/ripple/RegularKeySetTransactor.cpp b/modules/ripple_app/tx/RegularKeySetTransactor.cpp
similarity index 100%
rename from src/cpp/ripple/RegularKeySetTransactor.cpp
rename to modules/ripple_app/tx/RegularKeySetTransactor.cpp
diff --git a/src/cpp/ripple/RegularKeySetTransactor.h b/modules/ripple_app/tx/RegularKeySetTransactor.h
similarity index 100%
rename from src/cpp/ripple/RegularKeySetTransactor.h
rename to modules/ripple_app/tx/RegularKeySetTransactor.h
diff --git a/src/cpp/ripple/Transaction.cpp b/modules/ripple_app/tx/Transaction.cpp
similarity index 100%
rename from src/cpp/ripple/Transaction.cpp
rename to modules/ripple_app/tx/Transaction.cpp
diff --git a/src/cpp/ripple/Transaction.h b/modules/ripple_app/tx/Transaction.h
similarity index 100%
rename from src/cpp/ripple/Transaction.h
rename to modules/ripple_app/tx/Transaction.h
diff --git a/src/cpp/ripple/TransactionCheck.cpp b/modules/ripple_app/tx/TransactionCheck.cpp
similarity index 100%
rename from src/cpp/ripple/TransactionCheck.cpp
rename to modules/ripple_app/tx/TransactionCheck.cpp
diff --git a/src/cpp/ripple/TransactionEngine.cpp b/modules/ripple_app/tx/TransactionEngine.cpp
similarity index 100%
rename from src/cpp/ripple/TransactionEngine.cpp
rename to modules/ripple_app/tx/TransactionEngine.cpp
diff --git a/src/cpp/ripple/TransactionEngine.h b/modules/ripple_app/tx/TransactionEngine.h
similarity index 100%
rename from src/cpp/ripple/TransactionEngine.h
rename to modules/ripple_app/tx/TransactionEngine.h
diff --git a/src/cpp/ripple/TransactionMaster.cpp b/modules/ripple_app/tx/TransactionMaster.cpp
similarity index 100%
rename from src/cpp/ripple/TransactionMaster.cpp
rename to modules/ripple_app/tx/TransactionMaster.cpp
diff --git a/src/cpp/ripple/TransactionMaster.h b/modules/ripple_app/tx/TransactionMaster.h
similarity index 100%
rename from src/cpp/ripple/TransactionMaster.h
rename to modules/ripple_app/tx/TransactionMaster.h
diff --git a/src/cpp/ripple/TransactionMeta.cpp b/modules/ripple_app/tx/TransactionMeta.cpp
similarity index 100%
rename from src/cpp/ripple/TransactionMeta.cpp
rename to modules/ripple_app/tx/TransactionMeta.cpp
diff --git a/src/cpp/ripple/TransactionMeta.h b/modules/ripple_app/tx/TransactionMeta.h
similarity index 100%
rename from src/cpp/ripple/TransactionMeta.h
rename to modules/ripple_app/tx/TransactionMeta.h
diff --git a/src/cpp/ripple/TransactionQueue.cpp b/modules/ripple_app/tx/TransactionQueue.cpp
similarity index 100%
rename from src/cpp/ripple/TransactionQueue.cpp
rename to modules/ripple_app/tx/TransactionQueue.cpp
diff --git a/src/cpp/ripple/TransactionQueue.h b/modules/ripple_app/tx/TransactionQueue.h
similarity index 100%
rename from src/cpp/ripple/TransactionQueue.h
rename to modules/ripple_app/tx/TransactionQueue.h
diff --git a/src/cpp/ripple/Transactor.cpp b/modules/ripple_app/tx/Transactor.cpp
similarity index 100%
rename from src/cpp/ripple/Transactor.cpp
rename to modules/ripple_app/tx/Transactor.cpp
diff --git a/src/cpp/ripple/Transactor.h b/modules/ripple_app/tx/Transactor.h
similarity index 100%
rename from src/cpp/ripple/Transactor.h
rename to modules/ripple_app/tx/Transactor.h
diff --git a/src/cpp/ripple/TrustSetTransactor.cpp b/modules/ripple_app/tx/TrustSetTransactor.cpp
similarity index 100%
rename from src/cpp/ripple/TrustSetTransactor.cpp
rename to modules/ripple_app/tx/TrustSetTransactor.cpp
diff --git a/src/cpp/ripple/TrustSetTransactor.h b/modules/ripple_app/tx/TrustSetTransactor.h
similarity index 100%
rename from src/cpp/ripple/TrustSetTransactor.h
rename to modules/ripple_app/tx/TrustSetTransactor.h
diff --git a/src/cpp/ripple/WalletAddTransactor.cpp b/modules/ripple_app/tx/WalletAddTransactor.cpp
similarity index 100%
rename from src/cpp/ripple/WalletAddTransactor.cpp
rename to modules/ripple_app/tx/WalletAddTransactor.cpp
diff --git a/src/cpp/ripple/WalletAddTransactor.h b/modules/ripple_app/tx/WalletAddTransactor.h
similarity index 100%
rename from src/cpp/ripple/WalletAddTransactor.h
rename to modules/ripple_app/tx/WalletAddTransactor.h
diff --git a/src/cpp/ripple/ripple_TransactionAcquire.cpp b/modules/ripple_app/tx/ripple_TransactionAcquire.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_TransactionAcquire.cpp
rename to modules/ripple_app/tx/ripple_TransactionAcquire.cpp
diff --git a/src/cpp/ripple/ripple_TransactionAcquire.h b/modules/ripple_app/tx/ripple_TransactionAcquire.h
similarity index 100%
rename from src/cpp/ripple/ripple_TransactionAcquire.h
rename to modules/ripple_app/tx/ripple_TransactionAcquire.h
diff --git a/src/cpp/ripple/ripple.proto b/modules/ripple_data/protocol/ripple.proto
similarity index 100%
rename from src/cpp/ripple/ripple.proto
rename to modules/ripple_data/protocol/ripple.proto
diff --git a/site_scons/site_tools/protoc.py b/site_scons/site_tools/protoc.py
index 93d79309bb..dc3cf1b286 100644
--- a/site_scons/site_tools/protoc.py
+++ b/site_scons/site_tools/protoc.py
@@ -57,7 +57,7 @@ def ProtocEmitter(target, source, env):
# XXX KLUDGE: Force things to be right.
env['PROTOCOUTDIR'] = 'build/proto'
- env['PROTOCPROTOPATH'] = ['src/cpp/ripple']
+ env['PROTOCPROTOPATH'] = ['modules/ripple_data/protocol']
#~ print "PROTOC SOURCE:", [str(s) for s in source]
#~ print "PROTOC TARGET:", [str(s) for s in target]
diff --git a/src/cpp/ripple/ripple_ProofOfWorkFactoryUnitTests.cpp b/src/cpp/ripple/ripple_ProofOfWorkFactoryUnitTests.cpp
deleted file mode 100644
index 121e1743be..0000000000
--- a/src/cpp/ripple/ripple_ProofOfWorkFactoryUnitTests.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//------------------------------------------------------------------------------
-/*
- Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-