diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index 4763ee1a3..19a351089 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -2587,113 +2587,6 @@ - - True - - - - - - - - - - - - - - - - - - - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - True - - - - - True - - - - - True - - - - - True - - - True - - - - - True - - - True - - - True - - - True - - - True - - - - - True - - - True - - - True - - - - - True - True @@ -3111,6 +3004,106 @@ True + + + + + + + + + + + + + + + + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + True + + + + + True + + + + + True + + + + + True + + + True + + + + + True + + + True + + + True + + + True + + + True + + + + + True + + + True + + + True + + + + + True + @@ -3445,8 +3438,6 @@ - ..\..\src\leveldb\include;..\..\src\rocksdb\include;%(AdditionalIncludeDirectories) - ..\..\src\leveldb\include;..\..\src\rocksdb\include;%(AdditionalIncludeDirectories) @@ -3478,6 +3469,10 @@ + + ..\..\src\leveldb\include;..\..\src\rocksdb\include;%(AdditionalIncludeDirectories) + ..\..\src\leveldb\include;..\..\src\rocksdb\include;%(AdditionalIncludeDirectories) + diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index 563dc413b..de45b5fa9 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -412,21 +412,6 @@ {61C8064B-23D8-A490-1614-9D2BA78ADB68} - - {4AE7A273-D9A0-B02D-B176-CC21D166C84B} - - - {AC237386-B045-74E2-4CDE-8DDA6A0A71B8} - - - {0ED4B0B8-7611-3F48-E160-2A56D338F097} - - - {88114987-28FC-EE27-4F1D-8759061A3F77} - - - {7BE989C9-84A9-AF45-2261-A1A45D2AF3FA} - {FB5092D7-3AA5-4E7F-F783-C8A929D8B588} @@ -478,6 +463,18 @@ {587F434F-850E-8776-A958-745B41B9C407} + + {D3E78215-1C49-D4FB-E9FC-5074083D184F} + + + {B79A9145-D4DD-8A3C-59ED-AF8BEE7AD7A3} + + + {9D691DE1-17A1-5989-3E2E-F69B3E43152F} + + + {3FDC73B9-A9C7-3533-FD40-E4032B9FA9FB} + {186385AD-A056-FA3A-7E0E-759EB55E9EAB} @@ -3711,135 +3708,6 @@ ripple\module\core\functional - - ripple\module\core\nodestore - - - ripple\module\core\nodestore - - - ripple\module\core\nodestore\api - - - ripple\module\core\nodestore\api - - - ripple\module\core\nodestore\api - - - ripple\module\core\nodestore\api - - - ripple\module\core\nodestore\api - - - ripple\module\core\nodestore\api - - - ripple\module\core\nodestore\api - - - ripple\module\core\nodestore\api - - - ripple\module\core\nodestore\api - - - ripple\module\core\nodestore\api - - - ripple\module\core\nodestore\backend - - - ripple\module\core\nodestore\backend - - - ripple\module\core\nodestore\backend - - - ripple\module\core\nodestore\backend - - - ripple\module\core\nodestore\backend - - - ripple\module\core\nodestore\backend - - - ripple\module\core\nodestore\backend - - - ripple\module\core\nodestore\backend - - - ripple\module\core\nodestore\backend - - - ripple\module\core\nodestore\backend - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\impl - - - ripple\module\core\nodestore\tests - - - ripple\module\core\nodestore\tests - - - ripple\module\core\nodestore\tests - - - ripple\module\core\nodestore\tests - - - ripple\module\core\nodestore\tests - ripple\module\data\crypto @@ -4311,6 +4179,126 @@ ripple\module\websocket\autosocket + + ripple\nodestore + + + ripple\nodestore + + + ripple\nodestore + + + ripple\nodestore + + + ripple\nodestore + + + ripple\nodestore + + + ripple\nodestore + + + ripple\nodestore + + + ripple\nodestore + + + ripple\nodestore\backend + + + ripple\nodestore\backend + + + ripple\nodestore\backend + + + ripple\nodestore\backend + + + ripple\nodestore\backend + + + ripple\nodestore\backend + + + ripple\nodestore\backend + + + ripple\nodestore\backend + + + ripple\nodestore\backend + + + ripple\nodestore\backend + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\impl + + + ripple\nodestore\tests + + + ripple\nodestore\tests + + + ripple\nodestore\tests + + + ripple\nodestore\tests + + + ripple\nodestore\tests + ripple\peerfinder\api @@ -4785,6 +4773,9 @@ ripple\unity + + ripple\unity + ripple\unity diff --git a/SConstruct b/SConstruct index a39484e91..cd08e621d 100644 --- a/SConstruct +++ b/SConstruct @@ -518,25 +518,26 @@ for toolchain in toolchains: objects.append(addSource('src/ripple/unity/beast.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/beastc.c', env, variant_dirs)) objects.append(addSource('src/ripple/unity/common.cpp', env, variant_dirs)) + objects.append(addSource('src/ripple/unity/core.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/data.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/http.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/json.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/net.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/overlay.cpp', env, variant_dirs)) - objects.append(addSource('src/ripple/unity/rpcx.cpp', env, variant_dirs)) - objects.append(addSource('src/ripple/unity/websocket.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/peerfinder.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/protobuf.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/ripple.proto.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/radmap.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/resource.cpp', env, variant_dirs)) + objects.append(addSource('src/ripple/unity/rpcx.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/sitefiles.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/sslutil.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/testoverlay.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/types.cpp', env, variant_dirs)) objects.append(addSource('src/ripple/unity/validators.cpp', env, variant_dirs)) + objects.append(addSource('src/ripple/unity/websocket.cpp', env, variant_dirs)) - objects.append(addSource('src/ripple/unity/core.cpp', env, variant_dirs, [ + objects.append(addSource('src/ripple/unity/nodestore.cpp', env, variant_dirs, [ 'src/leveldb/include', #'src/hyperleveldb/include', # hyper 'src/rocksdb/include', diff --git a/src/ripple/common/TaggedCache.h b/src/ripple/common/TaggedCache.h index e2e1ff0e5..6f08d55a3 100644 --- a/src/ripple/common/TaggedCache.h +++ b/src/ripple/common/TaggedCache.h @@ -20,13 +20,12 @@ #ifndef RIPPLE_TAGGEDCACHE_H_INCLUDED #define RIPPLE_TAGGEDCACHE_H_INCLUDED +#include #include #include #include #include - #include - #include #include #include diff --git a/src/ripple/module/app/ledger/InboundLedger.cpp b/src/ripple/module/app/ledger/InboundLedger.cpp index 8bf641910..ad3be871f 100644 --- a/src/ripple/module/app/ledger/InboundLedger.cpp +++ b/src/ripple/module/app/ledger/InboundLedger.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include namespace ripple { diff --git a/src/ripple/module/app/ledger/Ledger.cpp b/src/ripple/module/app/ledger/Ledger.cpp index 890a8351c..948f68f6d 100644 --- a/src/ripple/module/app/ledger/Ledger.cpp +++ b/src/ripple/module/app/ledger/Ledger.cpp @@ -18,7 +18,7 @@ //============================================================================== #include - +#include #include namespace ripple { diff --git a/src/ripple/module/app/main/Application.cpp b/src/ripple/module/app/main/Application.cpp index 26c2a43f4..61b858633 100644 --- a/src/ripple/module/app/main/Application.cpp +++ b/src/ripple/module/app/main/Application.cpp @@ -22,9 +22,11 @@ #include #include #include -#include #include #include +#include +#include +#include #include diff --git a/src/ripple/module/app/main/NodeStoreScheduler.h b/src/ripple/module/app/main/NodeStoreScheduler.h index 3ea9be2c6..37acef98a 100644 --- a/src/ripple/module/app/main/NodeStoreScheduler.h +++ b/src/ripple/module/app/main/NodeStoreScheduler.h @@ -20,6 +20,9 @@ #ifndef RIPPLE_APP_NODESTORESCHEDULER_H_INCLUDED #define RIPPLE_APP_NODESTORESCHEDULER_H_INCLUDED +#include +#include + namespace ripple { /** A NodeStore::Scheduler which uses the JobQueue and implements the Stoppable API. */ diff --git a/src/ripple/module/app/node/SqliteFactory.h b/src/ripple/module/app/node/SqliteFactory.h index 057b0ca45..7ff70820a 100644 --- a/src/ripple/module/app/node/SqliteFactory.h +++ b/src/ripple/module/app/node/SqliteFactory.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_APP_SQLITEFACTORY_H_INCLUDED #define RIPPLE_APP_SQLITEFACTORY_H_INCLUDED +#include + namespace ripple { /** Factory to produce SQLite backends for the NodeStore. diff --git a/src/ripple/module/app/shamap/SHAMap.cpp b/src/ripple/module/app/shamap/SHAMap.cpp index 6bdd8e2bd..aebc766ba 100644 --- a/src/ripple/module/app/shamap/SHAMap.cpp +++ b/src/ripple/module/app/shamap/SHAMap.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include namespace ripple { diff --git a/src/ripple/module/app/shamap/SHAMap.h b/src/ripple/module/app/shamap/SHAMap.h index 16300ed31..5effbd122 100644 --- a/src/ripple/module/app/shamap/SHAMap.h +++ b/src/ripple/module/app/shamap/SHAMap.h @@ -21,7 +21,7 @@ #define RIPPLE_SHAMAP_H #include - +#include #include #include diff --git a/src/ripple/module/app/shamap/SHAMapSync.cpp b/src/ripple/module/app/shamap/SHAMapSync.cpp index 67bb4a39b..8e804a794 100644 --- a/src/ripple/module/app/shamap/SHAMapSync.cpp +++ b/src/ripple/module/app/shamap/SHAMapSync.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include namespace ripple { diff --git a/src/ripple/module/app/shamap/SHAMapSyncFilters.cpp b/src/ripple/module/app/shamap/SHAMapSyncFilters.cpp index 917c00121..b5da9863e 100644 --- a/src/ripple/module/app/shamap/SHAMapSyncFilters.cpp +++ b/src/ripple/module/app/shamap/SHAMapSyncFilters.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { ConsensusTransSetSF::ConsensusTransSetSF (NodeCache& nodeCache) diff --git a/src/ripple/module/basics/log/LogPartition.h b/src/ripple/module/basics/log/LogPartition.h index fc96ba2f8..c464df5b6 100644 --- a/src/ripple/module/basics/log/LogPartition.h +++ b/src/ripple/module/basics/log/LogPartition.h @@ -20,6 +20,10 @@ #ifndef RIPPLE_BASICS_LOGPARTITION_H_INCLUDED #define RIPPLE_BASICS_LOGPARTITION_H_INCLUDED +#include +#include +#include + namespace ripple { class LogPartition : public beast::Journal::Sink diff --git a/src/ripple/module/basics/utility/CountedObject.h b/src/ripple/module/basics/utility/CountedObject.h index 8a816c793..363650a41 100644 --- a/src/ripple/module/basics/utility/CountedObject.h +++ b/src/ripple/module/basics/utility/CountedObject.h @@ -21,6 +21,9 @@ #define RIPPLE_COUNTEDOBJECT_H_INCLUDED #include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/core/functional/Config.h b/src/ripple/module/core/functional/Config.h index 2b516741c..10df3b255 100644 --- a/src/ripple/module/core/functional/Config.h +++ b/src/ripple/module/core/functional/Config.h @@ -20,7 +20,13 @@ #ifndef RIPPLE_CORE_CONFIG_H_INCLUDED #define RIPPLE_CORE_CONFIG_H_INCLUDED +#include +#include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/core/nodestore/NodeStore.cpp b/src/ripple/module/core/nodestore/NodeStore.cpp deleted file mode 100644 index 4d97360ab..000000000 --- a/src/ripple/module/core/nodestore/NodeStore.cpp +++ /dev/null @@ -1,66 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include -#include - -// backend support -#include -#include -#include - -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include diff --git a/src/ripple/module/core/nodestore/NodeStore.h b/src/ripple/module/core/nodestore/NodeStore.h deleted file mode 100644 index f738b3cd0..000000000 --- a/src/ripple/module/core/nodestore/NodeStore.h +++ /dev/null @@ -1,34 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef RIPPLE_NODESTORE_H_INCLUDED -#define RIPPLE_NODESTORE_H_INCLUDED - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/src/ripple/module/data/protocol/Protocol.h b/src/ripple/module/data/protocol/Protocol.h index 4b18f15b0..e765f2917 100644 --- a/src/ripple/module/data/protocol/Protocol.h +++ b/src/ripple/module/data/protocol/Protocol.h @@ -20,6 +20,7 @@ #ifndef RIPPLE_PROTOCOL_H #define RIPPLE_PROTOCOL_H +#include #include namespace ripple { diff --git a/src/ripple/module/overlay/impl/PeerImp.h b/src/ripple/module/overlay/impl/PeerImp.h index 06aa0fdb0..cf98772c2 100644 --- a/src/ripple/module/overlay/impl/PeerImp.h +++ b/src/ripple/module/overlay/impl/PeerImp.h @@ -21,7 +21,7 @@ #define RIPPLE_OVERLAY_PEERIMP_H_INCLUDED #include - +#include #include #include #include @@ -1736,6 +1736,8 @@ private: if (obj.has_hash () && (obj.hash ().size () == (256 / 8))) { memcpy (hash.begin (), obj.hash ().data (), 256 / 8); + // VFALCO TODO Move this someplace more sensible so we dont + // need to inject the NodeStore interfaces. NodeObject::pointer hObj = getApp().getNodeStore ().fetch (hash); if (hObj) diff --git a/src/ripple/module/rpc/handlers/GetCounts.cpp b/src/ripple/module/rpc/handlers/GetCounts.cpp index c3e5d46cf..750df4e80 100644 --- a/src/ripple/module/rpc/handlers/GetCounts.cpp +++ b/src/ripple/module/rpc/handlers/GetCounts.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include namespace ripple { diff --git a/src/ripple/module/core/nodestore/api/Backend.h b/src/ripple/nodestore/Backend.h similarity index 98% rename from src/ripple/module/core/nodestore/api/Backend.h rename to src/ripple/nodestore/Backend.h index f5c69f0aa..8b7c2fb14 100644 --- a/src/ripple/module/core/nodestore/api/Backend.h +++ b/src/ripple/nodestore/Backend.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_NODESTORE_BACKEND_H_INCLUDED #define RIPPLE_NODESTORE_BACKEND_H_INCLUDED +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/api/Database.h b/src/ripple/nodestore/Database.h similarity index 99% rename from src/ripple/module/core/nodestore/api/Database.h rename to src/ripple/nodestore/Database.h index b18775887..7c31a69bc 100644 --- a/src/ripple/module/core/nodestore/api/Database.h +++ b/src/ripple/nodestore/Database.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_NODESTORE_DATABASE_H_INCLUDED #define RIPPLE_NODESTORE_DATABASE_H_INCLUDED +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/api/DummyScheduler.h b/src/ripple/nodestore/DummyScheduler.h similarity index 97% rename from src/ripple/module/core/nodestore/api/DummyScheduler.h rename to src/ripple/nodestore/DummyScheduler.h index 844a59318..707fa14c9 100644 --- a/src/ripple/module/core/nodestore/api/DummyScheduler.h +++ b/src/ripple/nodestore/DummyScheduler.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_NODESTORE_DUMMYSCHEDULER_H_INCLUDED #define RIPPLE_NODESTORE_DUMMYSCHEDULER_H_INCLUDED +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/api/Factory.h b/src/ripple/nodestore/Factory.h similarity index 97% rename from src/ripple/module/core/nodestore/api/Factory.h rename to src/ripple/nodestore/Factory.h index 963e79d89..fcfcbfe83 100644 --- a/src/ripple/module/core/nodestore/api/Factory.h +++ b/src/ripple/nodestore/Factory.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_NODESTORE_FACTORY_H_INCLUDED #define RIPPLE_NODESTORE_FACTORY_H_INCLUDED +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/api/Manager.h b/src/ripple/nodestore/Manager.h similarity index 100% rename from src/ripple/module/core/nodestore/api/Manager.h rename to src/ripple/nodestore/Manager.h diff --git a/src/ripple/module/core/nodestore/api/NodeObject.h b/src/ripple/nodestore/NodeObject.h similarity index 97% rename from src/ripple/module/core/nodestore/api/NodeObject.h rename to src/ripple/nodestore/NodeObject.h index 28f598477..cb9f86dd6 100644 --- a/src/ripple/module/core/nodestore/api/NodeObject.h +++ b/src/ripple/nodestore/NodeObject.h @@ -20,6 +20,9 @@ #ifndef RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED #define RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED +#include +#include + // VFALCO NOTE Intentionally not in the NodeStore namespace namespace ripple { diff --git a/src/ripple/module/core/nodestore/README.md b/src/ripple/nodestore/README.md similarity index 100% rename from src/ripple/module/core/nodestore/README.md rename to src/ripple/nodestore/README.md diff --git a/src/ripple/module/core/nodestore/api/Scheduler.h b/src/ripple/nodestore/Scheduler.h similarity index 98% rename from src/ripple/module/core/nodestore/api/Scheduler.h rename to src/ripple/nodestore/Scheduler.h index 307a463e2..c594a91b6 100644 --- a/src/ripple/module/core/nodestore/api/Scheduler.h +++ b/src/ripple/nodestore/Scheduler.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_NODESTORE_SCHEDULER_H_INCLUDED #define RIPPLE_NODESTORE_SCHEDULER_H_INCLUDED +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/api/Task.h b/src/ripple/nodestore/Task.h similarity index 100% rename from src/ripple/module/core/nodestore/api/Task.h rename to src/ripple/nodestore/Task.h diff --git a/src/ripple/module/core/nodestore/api/Types.h b/src/ripple/nodestore/Types.h similarity index 93% rename from src/ripple/module/core/nodestore/api/Types.h rename to src/ripple/nodestore/Types.h index 85701148b..73c5bbed1 100644 --- a/src/ripple/module/core/nodestore/api/Types.h +++ b/src/ripple/nodestore/Types.h @@ -20,6 +20,10 @@ #ifndef RIPPLE_NODESTORE_TYPES_H_INCLUDED #define RIPPLE_NODESTORE_TYPES_H_INCLUDED +#include +#include +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/api/VisitCallback.h b/src/ripple/nodestore/VisitCallback.h similarity index 100% rename from src/ripple/module/core/nodestore/api/VisitCallback.h rename to src/ripple/nodestore/VisitCallback.h diff --git a/src/ripple/module/core/nodestore/backend/HyperDBFactory.cpp b/src/ripple/nodestore/backend/HyperDBFactory.cpp similarity index 99% rename from src/ripple/module/core/nodestore/backend/HyperDBFactory.cpp rename to src/ripple/nodestore/backend/HyperDBFactory.cpp index e7791a834..95aad76ac 100644 --- a/src/ripple/module/core/nodestore/backend/HyperDBFactory.cpp +++ b/src/ripple/nodestore/backend/HyperDBFactory.cpp @@ -19,6 +19,8 @@ #if RIPPLE_HYPERLEVELDB_AVAILABLE +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/backend/HyperDBFactory.h b/src/ripple/nodestore/backend/HyperDBFactory.h similarity index 97% rename from src/ripple/module/core/nodestore/backend/HyperDBFactory.h rename to src/ripple/nodestore/backend/HyperDBFactory.h index 5cab82a4d..b81d9e876 100644 --- a/src/ripple/module/core/nodestore/backend/HyperDBFactory.h +++ b/src/ripple/nodestore/backend/HyperDBFactory.h @@ -22,6 +22,8 @@ #if RIPPLE_HYPERLEVELDB_AVAILABLE +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/backend/LevelDBFactory.cpp b/src/ripple/nodestore/backend/LevelDBFactory.cpp similarity index 98% rename from src/ripple/module/core/nodestore/backend/LevelDBFactory.cpp rename to src/ripple/nodestore/backend/LevelDBFactory.cpp index c698c5e3a..df88e86d7 100644 --- a/src/ripple/module/core/nodestore/backend/LevelDBFactory.cpp +++ b/src/ripple/nodestore/backend/LevelDBFactory.cpp @@ -17,6 +17,10 @@ */ //============================================================================== +#if RIPPLE_LEVELDB_AVAILABLE + +#include + namespace ripple { namespace NodeStore { @@ -273,3 +277,5 @@ make_LevelDBFactory () } } + +#endif diff --git a/src/ripple/module/core/nodestore/backend/LevelDBFactory.h b/src/ripple/nodestore/backend/LevelDBFactory.h similarity index 94% rename from src/ripple/module/core/nodestore/backend/LevelDBFactory.h rename to src/ripple/nodestore/backend/LevelDBFactory.h index 0f9c5a14a..af105a711 100644 --- a/src/ripple/module/core/nodestore/backend/LevelDBFactory.h +++ b/src/ripple/nodestore/backend/LevelDBFactory.h @@ -20,6 +20,10 @@ #ifndef RIPPLE_NODESTORE_LEVELDBFACTORY_H_INCLUDED #define RIPPLE_NODESTORE_LEVELDBFACTORY_H_INCLUDED +#if RIPPLE_LEVELDB_AVAILABLE + +#include + namespace ripple { namespace NodeStore { @@ -32,3 +36,5 @@ std::unique_ptr make_LevelDBFactory (); } #endif + +#endif diff --git a/src/ripple/module/core/nodestore/backend/MemoryFactory.cpp b/src/ripple/nodestore/backend/MemoryFactory.cpp similarity index 100% rename from src/ripple/module/core/nodestore/backend/MemoryFactory.cpp rename to src/ripple/nodestore/backend/MemoryFactory.cpp diff --git a/src/ripple/module/core/nodestore/backend/MemoryFactory.h b/src/ripple/nodestore/backend/MemoryFactory.h similarity index 97% rename from src/ripple/module/core/nodestore/backend/MemoryFactory.h rename to src/ripple/nodestore/backend/MemoryFactory.h index 37a2e58ed..35882a4df 100644 --- a/src/ripple/module/core/nodestore/backend/MemoryFactory.h +++ b/src/ripple/nodestore/backend/MemoryFactory.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_NODESTORE_MEMORYFACTORY_H_INCLUDED #define RIPPLE_NODESTORE_MEMORYFACTORY_H_INCLUDED +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/backend/NullFactory.cpp b/src/ripple/nodestore/backend/NullFactory.cpp similarity index 100% rename from src/ripple/module/core/nodestore/backend/NullFactory.cpp rename to src/ripple/nodestore/backend/NullFactory.cpp diff --git a/src/ripple/module/core/nodestore/backend/NullFactory.h b/src/ripple/nodestore/backend/NullFactory.h similarity index 97% rename from src/ripple/module/core/nodestore/backend/NullFactory.h rename to src/ripple/nodestore/backend/NullFactory.h index 77233b18c..a081a71c1 100644 --- a/src/ripple/module/core/nodestore/backend/NullFactory.h +++ b/src/ripple/nodestore/backend/NullFactory.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_NODESTORE_NULLFACTORY_H_INCLUDED #define RIPPLE_NODESTORE_NULLFACTORY_H_INCLUDED +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/backend/RocksDBFactory.cpp b/src/ripple/nodestore/backend/RocksDBFactory.cpp similarity index 99% rename from src/ripple/module/core/nodestore/backend/RocksDBFactory.cpp rename to src/ripple/nodestore/backend/RocksDBFactory.cpp index 1a060461c..47620d8b4 100644 --- a/src/ripple/module/core/nodestore/backend/RocksDBFactory.cpp +++ b/src/ripple/nodestore/backend/RocksDBFactory.cpp @@ -19,8 +19,8 @@ #if RIPPLE_ROCKSDB_AVAILABLE +#include #include - #include namespace ripple { diff --git a/src/ripple/module/core/nodestore/backend/RocksDBFactory.h b/src/ripple/nodestore/backend/RocksDBFactory.h similarity index 94% rename from src/ripple/module/core/nodestore/backend/RocksDBFactory.h rename to src/ripple/nodestore/backend/RocksDBFactory.h index 0fcdcbd0f..c4125838f 100644 --- a/src/ripple/module/core/nodestore/backend/RocksDBFactory.h +++ b/src/ripple/nodestore/backend/RocksDBFactory.h @@ -20,6 +20,10 @@ #ifndef RIPPLE_NODESTORE_ROCKSDBFACTORY_H_INCLUDED #define RIPPLE_NODESTORE_ROCKSDBFACTORY_H_INCLUDED +#if RIPPLE_ROCKSDB_AVAILABLE + +#include + namespace ripple { namespace NodeStore { @@ -32,3 +36,5 @@ std::unique_ptr make_RocksDBFactory (); } #endif + +#endif diff --git a/src/ripple/module/core/nodestore/impl/Backend.cpp b/src/ripple/nodestore/impl/Backend.cpp similarity index 100% rename from src/ripple/module/core/nodestore/impl/Backend.cpp rename to src/ripple/nodestore/impl/Backend.cpp diff --git a/src/ripple/module/core/nodestore/impl/BatchWriter.cpp b/src/ripple/nodestore/impl/BatchWriter.cpp similarity index 100% rename from src/ripple/module/core/nodestore/impl/BatchWriter.cpp rename to src/ripple/nodestore/impl/BatchWriter.cpp diff --git a/src/ripple/module/core/nodestore/impl/BatchWriter.h b/src/ripple/nodestore/impl/BatchWriter.h similarity index 95% rename from src/ripple/module/core/nodestore/impl/BatchWriter.h rename to src/ripple/nodestore/impl/BatchWriter.h index a512d0cdd..b7676f2c3 100644 --- a/src/ripple/module/core/nodestore/impl/BatchWriter.h +++ b/src/ripple/nodestore/impl/BatchWriter.h @@ -20,6 +20,9 @@ #ifndef RIPPLE_NODESTORE_BATCHWRITER_H_INCLUDED #define RIPPLE_NODESTORE_BATCHWRITER_H_INCLUDED +#include +#include +#include #include #include diff --git a/src/ripple/module/core/nodestore/impl/Database.cpp b/src/ripple/nodestore/impl/Database.cpp similarity index 100% rename from src/ripple/module/core/nodestore/impl/Database.cpp rename to src/ripple/nodestore/impl/Database.cpp diff --git a/src/ripple/module/core/nodestore/impl/DatabaseImp.h b/src/ripple/nodestore/impl/DatabaseImp.h similarity index 99% rename from src/ripple/module/core/nodestore/impl/DatabaseImp.h rename to src/ripple/nodestore/impl/DatabaseImp.h index a9dae69e8..a75f7f3ee 100644 --- a/src/ripple/module/core/nodestore/impl/DatabaseImp.h +++ b/src/ripple/nodestore/impl/DatabaseImp.h @@ -20,11 +20,13 @@ #ifndef RIPPLE_NODESTORE_DATABASEIMP_H_INCLUDED #define RIPPLE_NODESTORE_DATABASEIMP_H_INCLUDED +#include +#include #include - -#include -#include #include +#include +#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/impl/DecodedBlob.cpp b/src/ripple/nodestore/impl/DecodedBlob.cpp similarity index 100% rename from src/ripple/module/core/nodestore/impl/DecodedBlob.cpp rename to src/ripple/nodestore/impl/DecodedBlob.cpp diff --git a/src/ripple/module/core/nodestore/impl/DecodedBlob.h b/src/ripple/nodestore/impl/DecodedBlob.h similarity index 98% rename from src/ripple/module/core/nodestore/impl/DecodedBlob.h rename to src/ripple/nodestore/impl/DecodedBlob.h index a574b953e..b46ad15bf 100644 --- a/src/ripple/module/core/nodestore/impl/DecodedBlob.h +++ b/src/ripple/nodestore/impl/DecodedBlob.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_NODESTORE_DECODEDBLOB_H_INCLUDED #define RIPPLE_NODESTORE_DECODEDBLOB_H_INCLUDED +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/impl/DummyScheduler.cpp b/src/ripple/nodestore/impl/DummyScheduler.cpp similarity index 96% rename from src/ripple/module/core/nodestore/impl/DummyScheduler.cpp rename to src/ripple/nodestore/impl/DummyScheduler.cpp index 3de6752cf..be4b4d480 100644 --- a/src/ripple/module/core/nodestore/impl/DummyScheduler.cpp +++ b/src/ripple/nodestore/impl/DummyScheduler.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/impl/EncodedBlob.cpp b/src/ripple/nodestore/impl/EncodedBlob.cpp similarity index 100% rename from src/ripple/module/core/nodestore/impl/EncodedBlob.cpp rename to src/ripple/nodestore/impl/EncodedBlob.cpp diff --git a/src/ripple/module/core/nodestore/impl/EncodedBlob.h b/src/ripple/nodestore/impl/EncodedBlob.h similarity index 97% rename from src/ripple/module/core/nodestore/impl/EncodedBlob.h rename to src/ripple/nodestore/impl/EncodedBlob.h index 2b821ef60..b150a45e8 100644 --- a/src/ripple/module/core/nodestore/impl/EncodedBlob.h +++ b/src/ripple/nodestore/impl/EncodedBlob.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED #define RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/impl/Factory.cpp b/src/ripple/nodestore/impl/Factory.cpp similarity index 100% rename from src/ripple/module/core/nodestore/impl/Factory.cpp rename to src/ripple/nodestore/impl/Factory.cpp diff --git a/src/ripple/module/core/nodestore/impl/Manager.cpp b/src/ripple/nodestore/impl/Manager.cpp similarity index 99% rename from src/ripple/module/core/nodestore/impl/Manager.cpp rename to src/ripple/nodestore/impl/Manager.cpp index b134828c6..435e3baf3 100644 --- a/src/ripple/module/core/nodestore/impl/Manager.cpp +++ b/src/ripple/nodestore/impl/Manager.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { namespace NodeStore { diff --git a/src/ripple/module/core/nodestore/impl/NodeObject.cpp b/src/ripple/nodestore/impl/NodeObject.cpp similarity index 100% rename from src/ripple/module/core/nodestore/impl/NodeObject.cpp rename to src/ripple/nodestore/impl/NodeObject.cpp diff --git a/src/ripple/module/core/nodestore/impl/Scheduler.cpp b/src/ripple/nodestore/impl/Scheduler.cpp similarity index 100% rename from src/ripple/module/core/nodestore/impl/Scheduler.cpp rename to src/ripple/nodestore/impl/Scheduler.cpp diff --git a/src/ripple/module/core/nodestore/impl/Task.cpp b/src/ripple/nodestore/impl/Task.cpp similarity index 100% rename from src/ripple/module/core/nodestore/impl/Task.cpp rename to src/ripple/nodestore/impl/Task.cpp diff --git a/src/ripple/module/core/nodestore/impl/Tuning.h b/src/ripple/nodestore/impl/Tuning.h similarity index 100% rename from src/ripple/module/core/nodestore/impl/Tuning.h rename to src/ripple/nodestore/impl/Tuning.h diff --git a/src/ripple/module/core/nodestore/tests/BackendTests.cpp b/src/ripple/nodestore/tests/BackendTests.cpp similarity index 100% rename from src/ripple/module/core/nodestore/tests/BackendTests.cpp rename to src/ripple/nodestore/tests/BackendTests.cpp diff --git a/src/ripple/module/core/nodestore/tests/BasicTests.cpp b/src/ripple/nodestore/tests/BasicTests.cpp similarity index 100% rename from src/ripple/module/core/nodestore/tests/BasicTests.cpp rename to src/ripple/nodestore/tests/BasicTests.cpp diff --git a/src/ripple/module/core/nodestore/tests/DatabaseTests.cpp b/src/ripple/nodestore/tests/DatabaseTests.cpp similarity index 100% rename from src/ripple/module/core/nodestore/tests/DatabaseTests.cpp rename to src/ripple/nodestore/tests/DatabaseTests.cpp diff --git a/src/ripple/module/core/nodestore/tests/TestBase.h b/src/ripple/nodestore/tests/TestBase.h similarity index 100% rename from src/ripple/module/core/nodestore/tests/TestBase.h rename to src/ripple/nodestore/tests/TestBase.h diff --git a/src/ripple/module/core/nodestore/tests/TimingTests.cpp b/src/ripple/nodestore/tests/TimingTests.cpp similarity index 100% rename from src/ripple/module/core/nodestore/tests/TimingTests.cpp rename to src/ripple/nodestore/tests/TimingTests.cpp diff --git a/src/ripple/unity/core.cpp b/src/ripple/unity/core.cpp index da03bf8bf..87f5cb985 100644 --- a/src/ripple/unity/core.cpp +++ b/src/ripple/unity/core.cpp @@ -29,7 +29,6 @@ #include #include -#include #include #include // for HTTPClient diff --git a/src/ripple/unity/core.h b/src/ripple/unity/core.h index 8fba009c8..c2d9e09ec 100644 --- a/src/ripple/unity/core.h +++ b/src/ripple/unity/core.h @@ -28,8 +28,6 @@ #include -#include - #include #include #include diff --git a/src/ripple/unity/leveldb.h b/src/ripple/unity/leveldb.h index 38a7822e3..74f722b1e 100644 --- a/src/ripple/unity/leveldb.h +++ b/src/ripple/unity/leveldb.h @@ -20,6 +20,12 @@ #ifndef RIPPLE_LEVELDB_H_INCLUDED #define RIPPLE_LEVELDB_H_INCLUDED +#ifndef RIPPLE_LEVELDB_AVAILABLE +# define RIPPLE_LEVELDB_AVAILABLE 1 +#endif + +#if RIPPLE_LEVELDB_AVAILABLE + #define SNAPPY #include "leveldb/cache.h" #include "leveldb/filter_policy.h" @@ -27,3 +33,5 @@ #include "leveldb/write_batch.h" #endif + +#endif diff --git a/src/ripple/unity/nodestore.cpp b/src/ripple/unity/nodestore.cpp new file mode 100644 index 000000000..065962999 --- /dev/null +++ b/src/ripple/unity/nodestore.cpp @@ -0,0 +1,66 @@ +//------------------------------------------------------------------------------ +/* + This file is part of rippled: https://github.com/ripple/rippled + Copyright (c) 2012, 2013 Ripple Labs Inc. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +#include +#include + +// backend support +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include