From 4239880acb5e559446d2067f00dabb31cf102a23 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Tue, 16 Sep 2014 14:03:58 -0700 Subject: [PATCH] Clean up and restructure sources --- Builds/VisualStudio2013/RippleD.vcxproj | 2057 ++++++------- .../VisualStudio2013/RippleD.vcxproj.filters | 2738 ++++++++--------- SConstruct | 1 - src/ripple/algorithm/README.md | 3 - src/ripple/algorithm/TODO.md | 1 - src/ripple/{module => }/app/TODO.md | 0 src/ripple/{module => }/app/book/Amount.h | 2 +- src/ripple/{module => }/app/book/Amounts.h | 2 +- src/ripple/{module => }/app/book/BookTip.h | 4 +- src/ripple/{module => }/app/book/Offer.h | 10 +- .../{module => }/app/book/OfferStream.h | 8 +- src/ripple/{module => }/app/book/Quality.h | 4 +- src/ripple/{module => }/app/book/Taker.h | 8 +- src/ripple/{module => }/app/book/Types.h | 4 +- .../{module => }/app/book/impl/BookTip.cpp | 2 +- .../app/book/impl/OfferStream.cpp | 2 +- .../{module => }/app/book/impl/Quality.cpp | 2 +- .../{module => }/app/book/impl/Taker.cpp | 2 +- .../app/book/tests/OfferStream.test.cpp | 2 +- .../app/book/tests/Quality.test.cpp | 2 +- .../{module => }/app/consensus/DisputedTx.cpp | 0 .../{module => }/app/consensus/DisputedTx.h | 0 .../app/consensus/LedgerConsensus.cpp | 4 +- .../app/consensus/LedgerConsensus.h | 0 src/ripple/{module => }/app/data/DBInit.cpp | 0 src/ripple/{module => }/app/data/DBInit.h | 0 src/ripple/{module => }/app/data/Database.cpp | 0 src/ripple/{module => }/app/data/Database.h | 0 .../{module => }/app/data/DatabaseCon.cpp | 0 .../{module => }/app/data/DatabaseCon.h | 0 .../{module => }/app/data/SqliteDatabase.cpp | 0 .../{module => }/app/data/SqliteDatabase.h | 0 .../app/ledger/AcceptedLedger.cpp | 0 .../{module => }/app/ledger/AcceptedLedger.h | 0 .../app/ledger/AcceptedLedgerTx.cpp | 3 + .../app/ledger/AcceptedLedgerTx.h | 0 .../{module => }/app/ledger/BookListeners.cpp | 0 .../{module => }/app/ledger/BookListeners.h | 0 .../app/ledger/DirectoryEntryIterator.cpp | 0 .../app/ledger/DirectoryEntryIterator.h | 0 .../{module => }/app/ledger/InboundLedger.cpp | 0 .../{module => }/app/ledger/InboundLedger.h | 0 .../app/ledger/InboundLedgers.cpp | 0 .../{module => }/app/ledger/InboundLedgers.h | 1 + src/ripple/{module => }/app/ledger/Ledger.cpp | 9 +- src/ripple/{module => }/app/ledger/Ledger.h | 0 .../{module => }/app/ledger/LedgerCleaner.cpp | 2 +- .../{module => }/app/ledger/LedgerCleaner.h | 2 + .../app/ledger/LedgerEntrySet.cpp | 4 +- .../{module => }/app/ledger/LedgerEntrySet.h | 0 .../{module => }/app/ledger/LedgerHistory.cpp | 0 .../{module => }/app/ledger/LedgerHistory.h | 0 .../{module => }/app/ledger/LedgerHolder.h | 0 .../{module => }/app/ledger/LedgerMaster.cpp | 4 +- .../{module => }/app/ledger/LedgerMaster.h | 6 +- .../app/ledger/LedgerProposal.cpp | 2 +- .../{module => }/app/ledger/LedgerProposal.h | 0 .../{module => }/app/ledger/LedgerTiming.cpp | 0 .../{module => }/app/ledger/LedgerTiming.h | 0 .../{module => }/app/ledger/OrderBookDB.cpp | 0 .../{module => }/app/ledger/OrderBookDB.h | 2 +- .../app/ledger/OrderBookIterator.cpp | 0 .../app/ledger/OrderBookIterator.h | 0 src/ripple/{module => }/app/ledger/README.md | 0 .../app/ledger/SerializedValidation.cpp | 2 +- .../app/ledger/SerializedValidation.h | 0 src/ripple/{module => }/app/ledger/TODO.md | 0 .../{module => }/app/main/Application.cpp | 17 +- .../{module => }/app/main/Application.h | 2 +- .../impl => app/main}/BasicFullBelowCache.cpp | 0 .../api => app/main}/BasicFullBelowCache.h | 8 +- .../app/main/CollectorManager.cpp | 2 +- .../{module => }/app/main/CollectorManager.h | 0 .../app/main/FatalErrorReporter.cpp | 4 +- .../app/main/FatalErrorReporter.h | 0 .../{module => }/app/main/FullBelowCache.h | 6 +- .../{module => }/app/main/IoServicePool.cpp | 2 +- .../{module => }/app/main/IoServicePool.h | 0 .../{module => }/app/main/LoadManager.cpp | 2 +- .../{module => }/app/main/LoadManager.h | 2 + .../app/main/LocalCredentials.cpp | 3 +- .../{module => }/app/main/LocalCredentials.h | 0 src/ripple/{module => }/app/main/Main.cpp | 8 +- .../app/main/NodeStoreScheduler.cpp | 2 +- .../app/main/NodeStoreScheduler.h | 2 +- .../{module => }/app/main/ParameterTable.cpp | 1 + .../{module => }/app/main/ParameterTable.h | 0 .../{module => }/app/main/RPCHTTPServer.cpp | 6 +- .../{module => }/app/main/RPCHTTPServer.h | 0 src/ripple/{module => }/app/main/Tuning.h | 4 + .../{module => }/app/misc/AccountState.cpp | 3 + .../{module => }/app/misc/AccountState.h | 0 .../{module => }/app/misc/AmendmentTable.h | 2 +- .../app/misc/AmendmentTableImpl.cpp | 0 .../{module => }/app/misc/CanonicalTXSet.cpp | 0 .../{module => }/app/misc/CanonicalTXSet.h | 0 src/ripple/{module => }/app/misc/FeeVote.h | 0 .../{module => }/app/misc/FeeVoteImpl.cpp | 0 .../{module => }/app/misc/HashRouter.cpp | 2 + .../{module => }/app/misc/IHashRouter.h | 0 .../{module => }/app/misc/NetworkOPs.cpp | 12 +- src/ripple/{module => }/app/misc/NetworkOPs.h | 2 + src/ripple/{module => }/app/misc/OrderBook.h | 0 src/ripple/{module => }/app/misc/PowResult.h | 0 .../{module => }/app/misc/ProofOfWork.cpp | 1 + .../{module => }/app/misc/ProofOfWork.h | 2 +- .../app/misc/ProofOfWorkFactory.cpp | 0 .../app/misc/ProofOfWorkFactory.h | 4 +- src/ripple/{module => }/app/misc/README.md | 0 .../app/misc/SerializedLedger.cpp | 0 .../{module => }/app/misc/SerializedLedger.h | 0 .../app/misc/SerializedTransaction.cpp | 3 +- .../app/misc/SerializedTransaction.h | 0 .../{module => }/app/misc/Validations.cpp | 3 +- .../{module => }/app/misc/Validations.h | 0 .../{module => }/app/node/SqliteFactory.cpp | 3 +- .../{module => }/app/node/SqliteFactory.h | 0 src/ripple/{module => }/app/paths/Node.cpp | 0 src/ripple/{module => }/app/paths/Node.h | 6 +- .../{module => }/app/paths/NodeDirectory.h | 0 .../{module => }/app/paths/PathRequest.cpp | 6 +- .../{module => }/app/paths/PathRequest.h | 0 .../{module => }/app/paths/PathRequests.cpp | 3 +- .../{module => }/app/paths/PathRequests.h | 0 .../{module => }/app/paths/PathState.cpp | 0 src/ripple/{module => }/app/paths/PathState.h | 4 +- .../{module => }/app/paths/Pathfinder.cpp | 2 +- .../{module => }/app/paths/Pathfinder.h | 0 src/ripple/{module => }/app/paths/README.md | 0 .../{module => }/app/paths/RippleCalc.cpp | 4 +- .../{module => }/app/paths/RippleCalc.h | 0 .../app/paths/RippleLineCache.cpp | 0 .../{module => }/app/paths/RippleLineCache.h | 0 .../{module => }/app/paths/RippleState.cpp | 0 .../{module => }/app/paths/RippleState.h | 0 src/ripple/{module => }/app/paths/Tuning.h | 0 src/ripple/{module => }/app/paths/Types.h | 0 .../app/paths/cursor/AdvanceNode.cpp | 2 +- .../app/paths/cursor/DeliverNodeForward.cpp | 2 +- .../app/paths/cursor/DeliverNodeReverse.cpp | 2 +- .../app/paths/cursor/ForwardLiquidity.cpp | 0 .../cursor/ForwardLiquidityForAccount.cpp | 4 +- .../app/paths/cursor/Liquidity.cpp | 2 +- .../app/paths/cursor/NextIncrement.cpp | 2 +- .../app/paths/cursor/PathCursor.h | 0 .../app/paths/cursor/ReverseLiquidity.cpp | 0 .../cursor/ReverseLiquidityForAccount.cpp | 4 +- .../app/paths/cursor/RippleLiquidity.cpp | 2 +- .../app/paths/cursor/RippleLiquidity.h | 6 +- .../app/peers/ClusterNodeStatus.h | 0 src/ripple/{module => }/app/peers/PeerSet.cpp | 0 src/ripple/{module => }/app/peers/PeerSet.h | 1 + src/ripple/{module => }/app/peers/TODO.md | 0 .../{module => }/app/peers/UniqueNodeList.cpp | 13 +- .../{module => }/app/peers/UniqueNodeList.h | 2 + .../app/shamap/FetchPackTests.cpp | 0 src/ripple/{module => }/app/shamap/README.md | 0 .../{module => }/app/shamap/RadixMapTest.cpp | 0 .../{module => }/app/shamap/RadixMapTest.h | 0 src/ripple/{module => }/app/shamap/SHAMap.cpp | 0 src/ripple/{module => }/app/shamap/SHAMap.h | 4 +- .../{module => }/app/shamap/SHAMapAddNode.h | 0 .../{module => }/app/shamap/SHAMapDelta.cpp | 0 .../{module => }/app/shamap/SHAMapItem.cpp | 0 .../{module => }/app/shamap/SHAMapItem.h | 2 + .../app/shamap/SHAMapMissingNode.cpp | 0 .../app/shamap/SHAMapMissingNode.h | 0 .../{module => }/app/shamap/SHAMapNodeID.cpp | 2 +- .../{module => }/app/shamap/SHAMapNodeID.h | 2 +- .../{module => }/app/shamap/SHAMapSync.cpp | 0 .../app/shamap/SHAMapSyncFilter.h | 0 .../app/shamap/SHAMapSyncFilters.cpp | 0 .../app/shamap/SHAMapSyncFilters.h | 0 .../app/shamap/SHAMapTreeNode.cpp | 2 + .../{module => }/app/shamap/SHAMapTreeNode.h | 3 +- .../app/transactors/AddWallet.cpp | 0 .../app/transactors/CancelOffer.cpp | 0 .../app/transactors/CancelTicket.cpp | 0 .../app/transactors/CancelTicket.h | 0 .../{module => }/app/transactors/Change.cpp | 0 .../app/transactors/CreateOffer.cpp | 8 +- .../app/transactors/CreateOfferBridged.cpp | 6 +- .../app/transactors/CreateOfferDirect.cpp | 4 +- .../app/transactors/CreateTicket.cpp | 0 .../app/transactors/CreateTicket.h | 0 .../{module => }/app/transactors/Payment.cpp | 0 .../app/transactors/SetAccount.cpp | 2 +- .../app/transactors/SetRegularKey.cpp | 0 .../{module => }/app/transactors/SetTrust.cpp | 0 .../app/transactors/Transactor.cpp | 4 +- .../{module => }/app/transactors/Transactor.h | 0 src/ripple/{module => }/app/tx/LocalTxs.cpp | 0 src/ripple/{module => }/app/tx/LocalTxs.h | 0 .../{module => }/app/tx/Transaction.cpp | 0 src/ripple/{module => }/app/tx/Transaction.h | 0 .../app/tx/TransactionAcquire.cpp | 1 + .../{module => }/app/tx/TransactionAcquire.h | 0 .../{module => }/app/tx/TransactionCheck.cpp | 0 .../{module => }/app/tx/TransactionEngine.cpp | 0 .../{module => }/app/tx/TransactionEngine.h | 0 .../{module => }/app/tx/TransactionMaster.cpp | 0 .../{module => }/app/tx/TransactionMaster.h | 0 .../{module => }/app/tx/TransactionMeta.cpp | 0 .../{module => }/app/tx/TransactionMeta.h | 2 + src/ripple/{module => }/app/tx/TxQueue.cpp | 2 +- src/ripple/{module => }/app/tx/TxQueue.h | 0 .../{module => }/app/tx/TxQueueEntry.cpp | 2 + src/ripple/{module => }/app/tx/TxQueueEntry.h | 0 .../app/websocket/WSConnection.cpp | 0 .../{module => }/app/websocket/WSConnection.h | 0 .../{module => }/app/websocket/WSDoor.cpp | 2 +- .../{module => }/app/websocket/WSDoor.h | 0 .../app/websocket/WSServerHandler.cpp | 2 +- .../app/websocket/WSServerHandler.h | 2 +- .../{unity/radmap.h => basics/ArraySize.h} | 12 +- src/ripple/basics/{types => }/BasicTypes.h | 0 .../basics/{system => }/BoostIncludes.h | 0 .../{system => }/CheckLibraryVersions.h | 0 .../basics/{utility => }/CountedObject.h | 0 src/ripple/basics/{log => }/Log.h | 0 src/ripple/basics/{log => }/LoggedTimings.h | 2 +- src/ripple/basics/{containers => }/RangeSet.h | 0 .../basics/{utility => }/StringUtilities.h | 6 +- src/ripple/basics/{utility => }/Sustain.h | 0 .../{containers => }/SyncUnorderedMap.h | 3 +- src/ripple/basics/{utility => }/ThreadName.h | 0 src/ripple/basics/{utility => }/Time.h | 0 src/ripple/basics/{utility => }/ToString.h | 0 src/ripple/basics/{utility => }/UptimeTimer.h | 2 + .../{system => impl}/CheckLibraryVersions.cpp | 2 +- .../{utility => impl}/CountedObject.cpp | 2 +- src/ripple/basics/{log => impl}/Log.cpp | 0 .../basics/{containers => impl}/RangeSet.cpp | 4 +- .../{utility => impl}/StringUtilities.cpp | 4 +- .../basics/{utility => impl}/Sustain.cpp | 2 +- .../basics/{utility => impl}/ThreadName.cpp | 0 src/ripple/basics/{utility => impl}/Time.cpp | 0 .../basics/{utility => impl}/UptimeTimer.cpp | 2 +- src/ripple/basics/utility/PlatformMacros.h | 34 - .../api => common}/DecayingSample.h | 4 +- src/ripple/common/MultiSocket.h | 3 + src/ripple/common/impl/MultiSocketImpl.h | 3 + src/ripple/{module => }/core/Config.h | 3 +- src/ripple/{module => }/core/ConfigSections.h | 0 src/ripple/{module => }/core/Job.h | 4 +- src/ripple/{module => }/core/JobQueue.h | 6 +- src/ripple/{module => }/core/JobTypeData.h | 2 +- src/ripple/{module => }/core/JobTypeInfo.h | 0 src/ripple/{module => }/core/JobTypes.h | 4 +- src/ripple/{module => }/core/LoadEvent.h | 1 + src/ripple/{module => }/core/LoadFeeTrack.h | 4 + src/ripple/{module => }/core/LoadMonitor.h | 6 +- .../{module/core => core/impl}/Config.cpp | 14 +- src/ripple/{module/core => core/impl}/Job.cpp | 2 + .../{module/core => core/impl}/JobQueue.cpp | 14 +- .../{module/core => core/impl}/LoadEvent.cpp | 3 + .../core => core/impl}/LoadFeeTrackImp.cpp | 2 + .../core => core/impl}/LoadFeeTrackImp.h | 5 +- .../core => core/impl}/LoadMonitor.cpp | 4 +- .../{module => }/data/crypto/Base58Data.cpp | 0 .../{module => }/data/crypto/Base58Data.h | 4 +- src/ripple/{module => }/data/crypto/CKey.cpp | 0 src/ripple/{module => }/data/crypto/CKey.h | 0 .../data/crypto/CKeyDeterministic.cpp | 0 .../{module => }/data/crypto/CKeyECIES.cpp | 0 .../{module => }/data/crypto/RFC1751.cpp | 0 src/ripple/{module => }/data/crypto/RFC1751.h | 0 .../{module => }/data/protocol/BuildInfo.cpp | 0 .../{module => }/data/protocol/BuildInfo.h | 0 .../{module => }/data/protocol/HashPrefix.cpp | 0 .../{module => }/data/protocol/HashPrefix.h | 0 .../{module => }/data/protocol/KnownFormats.h | 0 .../data/protocol/LedgerFormats.cpp | 0 .../data/protocol/LedgerFormats.h | 0 .../{module => }/data/protocol/Protocol.h | 2 +- .../data/protocol/RippleAddress.cpp | 2 + .../data/protocol/RippleAddress.h | 20 +- .../{module => }/data/protocol/RippleSystem.h | 0 .../{module => }/data/protocol/SField.cpp | 2 +- .../{module => }/data/protocol/SField.h | 2 +- .../{module => }/data/protocol/STAmount.cpp | 4 +- .../{module => }/data/protocol/STAmount.h | 6 +- .../data/protocol/STAmount.test.cpp | 2 +- .../{module => }/data/protocol/STArray.cpp | 2 + .../{module => }/data/protocol/STArray.h | 3 +- .../{module => }/data/protocol/STBitString.h | 2 +- .../{module => }/data/protocol/STInteger.cpp | 4 +- .../{module => }/data/protocol/STInteger.h | 2 +- .../{module => }/data/protocol/STObject.cpp | 1 + .../{module => }/data/protocol/STObject.h | 1 + .../data/protocol/STParsedJSON.cpp | 3 +- .../{module => }/data/protocol/STParsedJSON.h | 0 .../protocol/SerializedObjectTemplate.cpp | 0 .../data/protocol/SerializedObjectTemplate.h | 0 .../data/protocol/SerializedType.h | 4 +- .../data/protocol/SerializedTypes.cpp | 3 + .../data/protocol/SerializedTypes.h | 12 +- .../{module => }/data/protocol/Serializer.cpp | 1 + .../{module => }/data/protocol/Serializer.h | 0 src/ripple/{module => }/data/protocol/TER.cpp | 2 + src/ripple/{module => }/data/protocol/TER.h | 0 .../{module => }/data/protocol/TxFlags.h | 0 .../{module => }/data/protocol/TxFormats.cpp | 0 .../{module => }/data/protocol/TxFormats.h | 0 .../data/utility/UptimeTimerAdapter.h | 2 +- src/ripple/json/json_value.h | 4 + .../{module/net/basics => net}/HTTPClient.h | 4 + .../{module/net/basics => net}/HTTPRequest.h | 4 + src/ripple/{module/net/rpc => net}/InfoSub.h | 6 +- src/ripple/{module/net/rpc => net}/RPCCall.h | 0 .../{module/net/basics => net}/RPCDoor.h | 2 + src/ripple/{module/net/rpc => net}/RPCErr.h | 0 .../{module/net/basics => net}/RPCServer.h | 0 src/ripple/{module/net/rpc => net}/RPCSub.h | 2 +- src/ripple/{module/net/rpc => net}/RPCUtil.h | 0 .../{module/net/basics => net}/SNTPClient.h | 0 .../net/basics => net/impl}/HTTPClient.cpp | 9 +- .../net/basics => net/impl}/HTTPRequest.cpp | 4 +- .../{module/net/rpc => net/impl}/InfoSub.cpp | 1 + .../{module/net/rpc => net/impl}/RPCCall.cpp | 5 + .../net/basics => net/impl}/RPCDoor.cpp | 2 + .../{module/net/rpc => net/impl}/RPCErr.cpp | 0 .../net/basics => net}/impl/RPCServerImp.h | 8 + .../{module/net/rpc => net/impl}/RPCSub.cpp | 3 + .../{module/net/rpc => net/impl}/RPCUtil.cpp | 4 + .../net/basics => net/impl}/SNTPClient.cpp | 4 + src/ripple/nodestore/NodeObject.h | 4 +- .../nodestore/backend/HyperDBFactory.cpp | 2 +- .../nodestore/backend/LevelDBFactory.cpp | 2 +- .../nodestore/backend/RocksDBFactory.cpp | 2 +- src/ripple/nodestore/impl/DatabaseImp.h | 2 +- src/ripple/overlay/Overlay.h | 2 +- src/ripple/overlay/Peer.h | 4 +- src/ripple/overlay/impl/OverlayImpl.h | 4 +- src/ripple/overlay/impl/PeerImp.cpp | 1 + src/ripple/overlay/impl/PeerImp.h | 13 +- src/ripple/peerfinder/{api => }/Callback.h | 3 +- src/ripple/peerfinder/{api => }/Config.h | 0 src/ripple/peerfinder/{api => }/Endpoint.h | 2 + src/ripple/peerfinder/{api => }/Manager.h | 9 +- src/ripple/peerfinder/{api => }/Slot.h | 5 +- src/ripple/peerfinder/{api => }/Types.h | 2 +- src/ripple/peerfinder/impl/Bootcache.cpp | 2 + src/ripple/peerfinder/impl/Bootcache.h | 5 + src/ripple/peerfinder/impl/Checker.cpp | 13 +- src/ripple/peerfinder/impl/CheckerAdapter.h | 3 + src/ripple/peerfinder/impl/Config.cpp | 2 + src/ripple/peerfinder/impl/Counts.h | 3 +- src/ripple/peerfinder/impl/Endpoint.cpp | 2 +- src/ripple/peerfinder/impl/Livecache.cpp | 1 + src/ripple/peerfinder/impl/Livecache.h | 4 +- src/ripple/peerfinder/impl/Logic.h | 12 +- src/ripple/peerfinder/impl/Manager.cpp | 7 + src/ripple/peerfinder/impl/SlotImp.h | 2 +- src/ripple/peerfinder/impl/Source.h | 4 +- src/ripple/peerfinder/impl/StoreSqdb.h | 2 + src/ripple/radmap/README.md | 5 - src/ripple/radmap/TODO.md | 1 - src/ripple/radmap/api/Tuning.h | 36 - src/ripple/resource/api/Consumer.h | 1 + src/ripple/{module => }/rpc/ErrorCodes.h | 0 src/ripple/{module => }/rpc/InternalHandler.h | 0 src/ripple/{module => }/rpc/Manager.h | 2 +- src/ripple/{module => }/rpc/README.md | 0 src/ripple/{module => }/rpc/RPCHandler.h | 18 +- .../{module => }/rpc/RPCServerHandler.h | 0 src/ripple/{module => }/rpc/Request.h | 0 src/ripple/{module => }/rpc/TODO.md | 0 src/ripple/{module => }/rpc/Tuning.h | 0 .../rpc/handlers/AccountCurrencies.cpp | 0 .../{module => }/rpc/handlers/AccountInfo.cpp | 0 .../rpc/handlers/AccountLines.cpp | 0 .../rpc/handlers/AccountOffers.cpp | 0 .../{module => }/rpc/handlers/AccountTx.cpp | 0 .../rpc/handlers/AccountTxOld.cpp | 0 .../rpc/handlers/AccountTxSwitch.cpp | 0 .../{module => }/rpc/handlers/BlackList.cpp | 0 .../{module => }/rpc/handlers/BookOffers.cpp | 0 .../{module => }/rpc/handlers/Connect.cpp | 0 .../rpc/handlers/ConsensusInfo.cpp | 0 .../{module => }/rpc/handlers/Feature.cpp | 0 .../{module => }/rpc/handlers/FetchInfo.cpp | 0 .../{module => }/rpc/handlers/GetCounts.cpp | 1 + .../{module => }/rpc/handlers/Handlers.h | 0 .../{module => }/rpc/handlers/Internal.cpp | 2 +- .../{module => }/rpc/handlers/Ledger.cpp | 0 .../rpc/handlers/LedgerAccept.cpp | 0 .../rpc/handlers/LedgerCleaner.cpp | 0 .../rpc/handlers/LedgerClosed.cpp | 0 .../rpc/handlers/LedgerCurrent.cpp | 0 .../{module => }/rpc/handlers/LedgerData.cpp | 0 .../{module => }/rpc/handlers/LedgerEntry.cpp | 0 .../rpc/handlers/LedgerHeader.cpp | 0 .../rpc/handlers/LedgerRequest.cpp | 0 .../{module => }/rpc/handlers/LogLevel.cpp | 0 .../{module => }/rpc/handlers/LogRotate.cpp | 0 .../{module => }/rpc/handlers/OwnerInfo.cpp | 0 .../{module => }/rpc/handlers/PathFind.cpp | 0 .../{module => }/rpc/handlers/Peers.cpp | 0 src/ripple/{module => }/rpc/handlers/Ping.cpp | 0 .../{module => }/rpc/handlers/Print.cpp | 0 .../{module => }/rpc/handlers/ProofCreate.cpp | 2 +- .../{module => }/rpc/handlers/ProofSolve.cpp | 0 .../{module => }/rpc/handlers/ProofVerify.cpp | 0 .../{module => }/rpc/handlers/Random.cpp | 0 .../rpc/handlers/RipplePathFind.cpp | 2 +- src/ripple/{module => }/rpc/handlers/SMS.cpp | 0 .../{module => }/rpc/handlers/ServerInfo.cpp | 0 .../{module => }/rpc/handlers/ServerState.cpp | 0 src/ripple/{module => }/rpc/handlers/Sign.cpp | 0 src/ripple/{module => }/rpc/handlers/Stop.cpp | 0 .../{module => }/rpc/handlers/Submit.cpp | 1 + .../{module => }/rpc/handlers/Subscribe.cpp | 0 .../rpc/handlers/TransactionEntry.cpp | 0 src/ripple/{module => }/rpc/handlers/Tx.cpp | 0 .../{module => }/rpc/handlers/TxHistory.cpp | 0 .../{module => }/rpc/handlers/UnlAdd.cpp | 0 .../{module => }/rpc/handlers/UnlDelete.cpp | 0 .../{module => }/rpc/handlers/UnlList.cpp | 0 .../{module => }/rpc/handlers/UnlLoad.cpp | 0 .../{module => }/rpc/handlers/UnlNetwork.cpp | 0 .../{module => }/rpc/handlers/UnlReset.cpp | 0 .../{module => }/rpc/handlers/UnlScore.cpp | 0 .../{module => }/rpc/handlers/Unsubscribe.cpp | 0 .../rpc/handlers/ValidationCreate.cpp | 0 .../rpc/handlers/ValidationSeed.cpp | 0 .../rpc/handlers/WalletAccounts.cpp | 0 .../rpc/handlers/WalletPropose.cpp | 0 .../{module => }/rpc/handlers/WalletSeed.cpp | 0 .../rpc/impl/AccountFromString.cpp | 2 +- .../{module => }/rpc/impl/AccountFromString.h | 0 src/ripple/{module => }/rpc/impl/Accounts.cpp | 2 +- src/ripple/{module => }/rpc/impl/Accounts.h | 0 .../{module => }/rpc/impl/Authorize.cpp | 2 +- src/ripple/{module => }/rpc/impl/Authorize.h | 0 src/ripple/{module => }/rpc/impl/Command.h | 0 src/ripple/{module => }/rpc/impl/Context.h | 2 +- src/ripple/{module => }/rpc/impl/DoPrint.h | 0 .../{module => }/rpc/impl/ErrorCodes.cpp | 2 +- .../rpc/impl/GetMasterGenerator.cpp | 2 +- .../rpc/impl/GetMasterGenerator.h | 0 src/ripple/{module => }/rpc/impl/Handler.cpp | 4 +- src/ripple/{module => }/rpc/impl/Handler.h | 4 +- .../{module => }/rpc/impl/LegacyPathFind.cpp | 4 +- .../{module => }/rpc/impl/LegacyPathFind.h | 0 .../{module => }/rpc/impl/LookupLedger.cpp | 2 +- .../{module => }/rpc/impl/LookupLedger.h | 0 src/ripple/{module => }/rpc/impl/Manager.cpp | 4 +- .../{module => }/rpc/impl/ParseAccountIds.cpp | 2 +- .../{module => }/rpc/impl/ParseAccountIds.h | 0 .../{module => }/rpc/impl/RPCHandler.cpp | 12 +- .../rpc/impl/RPCServerHandler.cpp | 12 +- .../{module => }/rpc/impl/TransactionSign.cpp | 3 +- .../{module => }/rpc/impl/TransactionSign.h | 0 src/ripple/sitefiles/api/Manager.h | 1 + src/ripple/sslutil/{api => }/CAutoBN_CTX.h | 2 +- src/ripple/sslutil/{api => }/CBigNum.h | 0 src/ripple/sslutil/{api => }/DHUtil.h | 0 src/ripple/sslutil/{api => }/ECDSACanonical.h | 0 src/ripple/sslutil/{api => }/bignum_error.h | 0 src/ripple/types/{api => }/AgedHistory.h | 0 src/ripple/types/{api => }/Base58.h | 2 +- src/ripple/types/{api => }/Blob.h | 0 src/ripple/types/{api => }/Book.h | 2 +- src/ripple/types/{api => }/ByteOrder.h | 0 src/ripple/types/{api => }/CryptoIdentifier.h | 4 +- src/ripple/types/{api => }/HashMaps.h | 0 .../types/{api => }/IdentifierStorage.h | 0 src/ripple/types/{api => }/IdentifierType.h | 0 src/ripple/types/{api => }/Issue.h | 2 +- src/ripple/types/{api => }/RandomNumbers.h | 0 src/ripple/types/{api => }/RippleAccountID.h | 4 +- .../types/{api => }/RippleAccountPrivateKey.h | 2 +- .../types/{api => }/RippleAccountPublicKey.h | 2 +- src/ripple/types/{api => }/RippleLedgerHash.h | 2 +- src/ripple/types/{api => }/RipplePrivateKey.h | 2 +- src/ripple/types/{api => }/RipplePublicKey.h | 4 +- .../types/{api => }/RipplePublicKeyHash.h | 2 +- src/ripple/types/{api => }/SimpleIdentifier.h | 2 +- src/ripple/types/TODO.md | 6 - src/ripple/types/{api => }/UInt160.h | 4 +- src/ripple/types/{api => }/UintTypes.h | 2 +- src/ripple/types/{api => }/base_uint.h | 6 +- src/ripple/types/impl/UintTypes.cpp | 6 +- src/ripple/types/{api => }/strHex.h | 0 src/ripple/unity/app.cpp | 28 +- src/ripple/unity/app.h | 122 +- src/ripple/unity/app1.cpp | 22 +- src/ripple/unity/app2.cpp | 32 +- src/ripple/unity/app3.cpp | 10 +- src/ripple/unity/app4.cpp | 22 +- src/ripple/unity/app5.cpp | 13 +- src/ripple/unity/app6.cpp | 16 +- src/ripple/unity/app7.cpp | 16 +- src/ripple/unity/app8.cpp | 38 +- src/ripple/unity/app9.cpp | 34 +- src/ripple/unity/basics.cpp | 18 +- src/ripple/unity/basics.h | 45 - src/ripple/unity/common.cpp | 6 +- src/ripple/unity/core.cpp | 24 +- src/ripple/unity/data.cpp | 48 +- src/ripple/unity/data.h | 44 +- src/ripple/unity/net.cpp | 42 +- src/ripple/unity/net.h | 24 +- src/ripple/unity/peerfinder.cpp | 37 - src/ripple/unity/peerfinder.h | 34 - src/ripple/unity/radmap.cpp | 22 - src/ripple/unity/resource.cpp | 2 +- src/ripple/unity/rpcx.cpp | 150 +- src/ripple/unity/rpcx.h | 6 +- src/ripple/unity/sslutil.h | 10 +- src/ripple/unity/types.cpp | 2 - src/ripple/unity/types.h | 40 +- src/ripple/unity/websocket.cpp | 4 +- src/ripple/validators/Source.h | 2 +- src/ripple/validators/Types.h | 2 +- src/ripple/validators/impl/ChosenList.h | 2 +- .../validators/tests/Validators.test.cpp | 2 +- .../websocket/autosocket/AutoSocket.cpp | 0 .../websocket/autosocket/AutoSocket.h | 8 +- .../websocket/autosocket/LogWebsockets.cpp | 0 test/freeze-test.coffee | 2 +- 522 files changed, 3264 insertions(+), 3400 deletions(-) delete mode 100644 src/ripple/algorithm/README.md delete mode 100644 src/ripple/algorithm/TODO.md rename src/ripple/{module => }/app/TODO.md (100%) rename src/ripple/{module => }/app/book/Amount.h (99%) rename src/ripple/{module => }/app/book/Amounts.h (97%) rename src/ripple/{module => }/app/book/BookTip.h (96%) rename src/ripple/{module => }/app/book/Offer.h (93%) rename src/ripple/{module => }/app/book/OfferStream.h (95%) rename src/ripple/{module => }/app/book/Quality.h (97%) rename src/ripple/{module => }/app/book/Taker.h (95%) rename src/ripple/{module => }/app/book/Types.h (94%) rename src/ripple/{module => }/app/book/impl/BookTip.cpp (98%) rename src/ripple/{module => }/app/book/impl/OfferStream.cpp (99%) rename src/ripple/{module => }/app/book/impl/Quality.cpp (98%) rename src/ripple/{module => }/app/book/impl/Taker.cpp (99%) rename src/ripple/{module => }/app/book/tests/OfferStream.test.cpp (96%) rename src/ripple/{module => }/app/book/tests/Quality.test.cpp (99%) rename src/ripple/{module => }/app/consensus/DisputedTx.cpp (100%) rename src/ripple/{module => }/app/consensus/DisputedTx.h (100%) rename src/ripple/{module => }/app/consensus/LedgerConsensus.cpp (99%) rename src/ripple/{module => }/app/consensus/LedgerConsensus.h (100%) rename src/ripple/{module => }/app/data/DBInit.cpp (100%) rename src/ripple/{module => }/app/data/DBInit.h (100%) rename src/ripple/{module => }/app/data/Database.cpp (100%) rename src/ripple/{module => }/app/data/Database.h (100%) rename src/ripple/{module => }/app/data/DatabaseCon.cpp (100%) rename src/ripple/{module => }/app/data/DatabaseCon.h (100%) rename src/ripple/{module => }/app/data/SqliteDatabase.cpp (100%) rename src/ripple/{module => }/app/data/SqliteDatabase.h (100%) rename src/ripple/{module => }/app/ledger/AcceptedLedger.cpp (100%) rename src/ripple/{module => }/app/ledger/AcceptedLedger.h (100%) rename src/ripple/{module => }/app/ledger/AcceptedLedgerTx.cpp (97%) rename src/ripple/{module => }/app/ledger/AcceptedLedgerTx.h (100%) rename src/ripple/{module => }/app/ledger/BookListeners.cpp (100%) rename src/ripple/{module => }/app/ledger/BookListeners.h (100%) rename src/ripple/{module => }/app/ledger/DirectoryEntryIterator.cpp (100%) rename src/ripple/{module => }/app/ledger/DirectoryEntryIterator.h (100%) rename src/ripple/{module => }/app/ledger/InboundLedger.cpp (100%) rename src/ripple/{module => }/app/ledger/InboundLedger.h (100%) rename src/ripple/{module => }/app/ledger/InboundLedgers.cpp (100%) rename src/ripple/{module => }/app/ledger/InboundLedgers.h (98%) rename src/ripple/{module => }/app/ledger/Ledger.cpp (99%) rename src/ripple/{module => }/app/ledger/Ledger.h (100%) rename src/ripple/{module => }/app/ledger/LedgerCleaner.cpp (99%) rename src/ripple/{module => }/app/ledger/LedgerCleaner.h (96%) rename src/ripple/{module => }/app/ledger/LedgerEntrySet.cpp (99%) rename src/ripple/{module => }/app/ledger/LedgerEntrySet.h (100%) rename src/ripple/{module => }/app/ledger/LedgerHistory.cpp (100%) rename src/ripple/{module => }/app/ledger/LedgerHistory.h (100%) rename src/ripple/{module => }/app/ledger/LedgerHolder.h (100%) rename src/ripple/{module => }/app/ledger/LedgerMaster.cpp (99%) rename src/ripple/{module => }/app/ledger/LedgerMaster.h (97%) rename src/ripple/{module => }/app/ledger/LedgerProposal.cpp (99%) rename src/ripple/{module => }/app/ledger/LedgerProposal.h (100%) rename src/ripple/{module => }/app/ledger/LedgerTiming.cpp (100%) rename src/ripple/{module => }/app/ledger/LedgerTiming.h (100%) rename src/ripple/{module => }/app/ledger/OrderBookDB.cpp (100%) rename src/ripple/{module => }/app/ledger/OrderBookDB.h (98%) rename src/ripple/{module => }/app/ledger/OrderBookIterator.cpp (100%) rename src/ripple/{module => }/app/ledger/OrderBookIterator.h (100%) rename src/ripple/{module => }/app/ledger/README.md (100%) rename src/ripple/{module => }/app/ledger/SerializedValidation.cpp (99%) rename src/ripple/{module => }/app/ledger/SerializedValidation.h (100%) rename src/ripple/{module => }/app/ledger/TODO.md (100%) rename src/ripple/{module => }/app/main/Application.cpp (99%) rename src/ripple/{module => }/app/main/Application.h (99%) rename src/ripple/{radmap/impl => app/main}/BasicFullBelowCache.cpp (100%) rename src/ripple/{radmap/api => app/main}/BasicFullBelowCache.h (98%) rename src/ripple/{module => }/app/main/CollectorManager.cpp (97%) rename src/ripple/{module => }/app/main/CollectorManager.h (100%) rename src/ripple/{module => }/app/main/FatalErrorReporter.cpp (95%) rename src/ripple/{module => }/app/main/FatalErrorReporter.h (100%) rename src/ripple/{module => }/app/main/FullBelowCache.h (88%) rename src/ripple/{module => }/app/main/IoServicePool.cpp (98%) rename src/ripple/{module => }/app/main/IoServicePool.h (100%) rename src/ripple/{module => }/app/main/LoadManager.cpp (99%) rename src/ripple/{module => }/app/main/LoadManager.h (98%) rename src/ripple/{module => }/app/main/LocalCredentials.cpp (98%) rename src/ripple/{module => }/app/main/LocalCredentials.h (100%) rename src/ripple/{module => }/app/main/Main.cpp (98%) rename src/ripple/{module => }/app/main/NodeStoreScheduler.cpp (97%) rename src/ripple/{module => }/app/main/NodeStoreScheduler.h (98%) rename src/ripple/{module => }/app/main/ParameterTable.cpp (99%) rename src/ripple/{module => }/app/main/ParameterTable.h (100%) rename src/ripple/{module => }/app/main/RPCHTTPServer.cpp (98%) rename src/ripple/{module => }/app/main/RPCHTTPServer.h (100%) rename src/ripple/{module => }/app/main/Tuning.h (94%) rename src/ripple/{module => }/app/misc/AccountState.cpp (97%) rename src/ripple/{module => }/app/misc/AccountState.h (100%) rename src/ripple/{module => }/app/misc/AmendmentTable.h (99%) rename src/ripple/{module => }/app/misc/AmendmentTableImpl.cpp (100%) rename src/ripple/{module => }/app/misc/CanonicalTXSet.cpp (100%) rename src/ripple/{module => }/app/misc/CanonicalTXSet.h (100%) rename src/ripple/{module => }/app/misc/FeeVote.h (100%) rename src/ripple/{module => }/app/misc/FeeVoteImpl.cpp (100%) rename src/ripple/{module => }/app/misc/HashRouter.cpp (99%) rename src/ripple/{module => }/app/misc/IHashRouter.h (100%) rename src/ripple/{module => }/app/misc/NetworkOPs.cpp (99%) rename src/ripple/{module => }/app/misc/NetworkOPs.h (99%) rename src/ripple/{module => }/app/misc/OrderBook.h (100%) rename src/ripple/{module => }/app/misc/PowResult.h (100%) rename src/ripple/{module => }/app/misc/ProofOfWork.cpp (99%) rename src/ripple/{module => }/app/misc/ProofOfWork.h (98%) rename src/ripple/{module => }/app/misc/ProofOfWorkFactory.cpp (100%) rename src/ripple/{module => }/app/misc/ProofOfWorkFactory.h (95%) rename src/ripple/{module => }/app/misc/README.md (100%) rename src/ripple/{module => }/app/misc/SerializedLedger.cpp (100%) rename src/ripple/{module => }/app/misc/SerializedLedger.h (100%) rename src/ripple/{module => }/app/misc/SerializedTransaction.cpp (99%) rename src/ripple/{module => }/app/misc/SerializedTransaction.h (100%) rename src/ripple/{module => }/app/misc/Validations.cpp (99%) rename src/ripple/{module => }/app/misc/Validations.h (100%) rename src/ripple/{module => }/app/node/SqliteFactory.cpp (98%) rename src/ripple/{module => }/app/node/SqliteFactory.h (100%) rename src/ripple/{module => }/app/paths/Node.cpp (100%) rename src/ripple/{module => }/app/paths/Node.h (96%) rename src/ripple/{module => }/app/paths/NodeDirectory.h (100%) rename src/ripple/{module => }/app/paths/PathRequest.cpp (99%) rename src/ripple/{module => }/app/paths/PathRequest.h (100%) rename src/ripple/{module => }/app/paths/PathRequests.cpp (99%) rename src/ripple/{module => }/app/paths/PathRequests.h (100%) rename src/ripple/{module => }/app/paths/PathState.cpp (100%) rename src/ripple/{module => }/app/paths/PathState.h (98%) rename src/ripple/{module => }/app/paths/Pathfinder.cpp (99%) rename src/ripple/{module => }/app/paths/Pathfinder.h (100%) rename src/ripple/{module => }/app/paths/README.md (100%) rename src/ripple/{module => }/app/paths/RippleCalc.cpp (99%) rename src/ripple/{module => }/app/paths/RippleCalc.h (100%) rename src/ripple/{module => }/app/paths/RippleLineCache.cpp (100%) rename src/ripple/{module => }/app/paths/RippleLineCache.h (100%) rename src/ripple/{module => }/app/paths/RippleState.cpp (100%) rename src/ripple/{module => }/app/paths/RippleState.h (100%) rename src/ripple/{module => }/app/paths/Tuning.h (100%) rename src/ripple/{module => }/app/paths/Types.h (100%) rename src/ripple/{module => }/app/paths/cursor/AdvanceNode.cpp (99%) rename src/ripple/{module => }/app/paths/cursor/DeliverNodeForward.cpp (99%) rename src/ripple/{module => }/app/paths/cursor/DeliverNodeReverse.cpp (99%) rename src/ripple/{module => }/app/paths/cursor/ForwardLiquidity.cpp (100%) rename src/ripple/{module => }/app/paths/cursor/ForwardLiquidityForAccount.cpp (99%) rename src/ripple/{module => }/app/paths/cursor/Liquidity.cpp (97%) rename src/ripple/{module => }/app/paths/cursor/NextIncrement.cpp (97%) rename src/ripple/{module => }/app/paths/cursor/PathCursor.h (100%) rename src/ripple/{module => }/app/paths/cursor/ReverseLiquidity.cpp (100%) rename src/ripple/{module => }/app/paths/cursor/ReverseLiquidityForAccount.cpp (99%) rename src/ripple/{module => }/app/paths/cursor/RippleLiquidity.cpp (99%) rename src/ripple/{module => }/app/paths/cursor/RippleLiquidity.h (92%) rename src/ripple/{module => }/app/peers/ClusterNodeStatus.h (100%) rename src/ripple/{module => }/app/peers/PeerSet.cpp (100%) rename src/ripple/{module => }/app/peers/PeerSet.h (99%) rename src/ripple/{module => }/app/peers/TODO.md (100%) rename src/ripple/{module => }/app/peers/UniqueNodeList.cpp (99%) rename src/ripple/{module => }/app/peers/UniqueNodeList.h (97%) rename src/ripple/{module => }/app/shamap/FetchPackTests.cpp (100%) rename src/ripple/{module => }/app/shamap/README.md (100%) rename src/ripple/{module => }/app/shamap/RadixMapTest.cpp (100%) rename src/ripple/{module => }/app/shamap/RadixMapTest.h (100%) rename src/ripple/{module => }/app/shamap/SHAMap.cpp (100%) rename src/ripple/{module => }/app/shamap/SHAMap.h (99%) rename src/ripple/{module => }/app/shamap/SHAMapAddNode.h (100%) rename src/ripple/{module => }/app/shamap/SHAMapDelta.cpp (100%) rename src/ripple/{module => }/app/shamap/SHAMapItem.cpp (100%) rename src/ripple/{module => }/app/shamap/SHAMapItem.h (98%) rename src/ripple/{module => }/app/shamap/SHAMapMissingNode.cpp (100%) rename src/ripple/{module => }/app/shamap/SHAMapMissingNode.h (100%) rename src/ripple/{module => }/app/shamap/SHAMapNodeID.cpp (98%) rename src/ripple/{module => }/app/shamap/SHAMapNodeID.h (99%) rename src/ripple/{module => }/app/shamap/SHAMapSync.cpp (100%) rename src/ripple/{module => }/app/shamap/SHAMapSyncFilter.h (100%) rename src/ripple/{module => }/app/shamap/SHAMapSyncFilters.cpp (100%) rename src/ripple/{module => }/app/shamap/SHAMapSyncFilters.h (100%) rename src/ripple/{module => }/app/shamap/SHAMapTreeNode.cpp (99%) rename src/ripple/{module => }/app/shamap/SHAMapTreeNode.h (98%) rename src/ripple/{module => }/app/transactors/AddWallet.cpp (100%) rename src/ripple/{module => }/app/transactors/CancelOffer.cpp (100%) rename src/ripple/{module => }/app/transactors/CancelTicket.cpp (100%) rename src/ripple/{module => }/app/transactors/CancelTicket.h (100%) rename src/ripple/{module => }/app/transactors/Change.cpp (100%) rename src/ripple/{module => }/app/transactors/CreateOffer.cpp (99%) rename src/ripple/{module => }/app/transactors/CreateOfferBridged.cpp (98%) rename src/ripple/{module => }/app/transactors/CreateOfferDirect.cpp (97%) rename src/ripple/{module => }/app/transactors/CreateTicket.cpp (100%) rename src/ripple/{module => }/app/transactors/CreateTicket.h (100%) rename src/ripple/{module => }/app/transactors/Payment.cpp (100%) rename src/ripple/{module => }/app/transactors/SetAccount.cpp (99%) rename src/ripple/{module => }/app/transactors/SetRegularKey.cpp (100%) rename src/ripple/{module => }/app/transactors/SetTrust.cpp (100%) rename src/ripple/{module => }/app/transactors/Transactor.cpp (99%) rename src/ripple/{module => }/app/transactors/Transactor.h (100%) rename src/ripple/{module => }/app/tx/LocalTxs.cpp (100%) rename src/ripple/{module => }/app/tx/LocalTxs.h (100%) rename src/ripple/{module => }/app/tx/Transaction.cpp (100%) rename src/ripple/{module => }/app/tx/Transaction.h (100%) rename src/ripple/{module => }/app/tx/TransactionAcquire.cpp (99%) rename src/ripple/{module => }/app/tx/TransactionAcquire.h (100%) rename src/ripple/{module => }/app/tx/TransactionCheck.cpp (100%) rename src/ripple/{module => }/app/tx/TransactionEngine.cpp (100%) rename src/ripple/{module => }/app/tx/TransactionEngine.h (100%) rename src/ripple/{module => }/app/tx/TransactionMaster.cpp (100%) rename src/ripple/{module => }/app/tx/TransactionMaster.h (100%) rename src/ripple/{module => }/app/tx/TransactionMeta.cpp (100%) rename src/ripple/{module => }/app/tx/TransactionMeta.h (99%) rename src/ripple/{module => }/app/tx/TxQueue.cpp (99%) rename src/ripple/{module => }/app/tx/TxQueue.h (100%) rename src/ripple/{module => }/app/tx/TxQueueEntry.cpp (97%) rename src/ripple/{module => }/app/tx/TxQueueEntry.h (100%) rename src/ripple/{module => }/app/websocket/WSConnection.cpp (100%) rename src/ripple/{module => }/app/websocket/WSConnection.h (100%) rename src/ripple/{module => }/app/websocket/WSDoor.cpp (99%) rename src/ripple/{module => }/app/websocket/WSDoor.h (100%) rename src/ripple/{module => }/app/websocket/WSServerHandler.cpp (94%) rename src/ripple/{module => }/app/websocket/WSServerHandler.h (99%) rename src/ripple/{unity/radmap.h => basics/ArraySize.h} (85%) rename src/ripple/basics/{types => }/BasicTypes.h (100%) rename src/ripple/basics/{system => }/BoostIncludes.h (100%) rename src/ripple/basics/{system => }/CheckLibraryVersions.h (100%) rename src/ripple/basics/{utility => }/CountedObject.h (100%) rename src/ripple/basics/{log => }/Log.h (100%) rename src/ripple/basics/{log => }/LoggedTimings.h (98%) rename src/ripple/basics/{containers => }/RangeSet.h (100%) rename src/ripple/basics/{utility => }/StringUtilities.h (97%) rename src/ripple/basics/{utility => }/Sustain.h (100%) rename src/ripple/basics/{containers => }/SyncUnorderedMap.h (98%) rename src/ripple/basics/{utility => }/ThreadName.h (100%) rename src/ripple/basics/{utility => }/Time.h (100%) rename src/ripple/basics/{utility => }/ToString.h (100%) rename src/ripple/basics/{utility => }/UptimeTimer.h (98%) rename src/ripple/basics/{system => impl}/CheckLibraryVersions.cpp (98%) rename src/ripple/basics/{utility => impl}/CountedObject.cpp (98%) rename src/ripple/basics/{log => impl}/Log.cpp (100%) rename src/ripple/basics/{containers => impl}/RangeSet.cpp (98%) rename src/ripple/basics/{utility => impl}/StringUtilities.cpp (99%) rename src/ripple/basics/{utility => impl}/Sustain.cpp (98%) rename src/ripple/basics/{utility => impl}/ThreadName.cpp (100%) rename src/ripple/basics/{utility => impl}/Time.cpp (100%) rename src/ripple/basics/{utility => impl}/UptimeTimer.cpp (97%) delete mode 100644 src/ripple/basics/utility/PlatformMacros.h rename src/ripple/{algorithm/api => common}/DecayingSample.h (96%) rename src/ripple/{module => }/core/Config.h (99%) rename src/ripple/{module => }/core/ConfigSections.h (100%) rename src/ripple/{module => }/core/Job.h (98%) rename src/ripple/{module => }/core/JobQueue.h (94%) rename src/ripple/{module => }/core/JobTypeData.h (98%) rename src/ripple/{module => }/core/JobTypeInfo.h (100%) rename src/ripple/{module => }/core/JobTypes.h (98%) rename src/ripple/{module => }/core/LoadEvent.h (99%) rename src/ripple/{module => }/core/LoadFeeTrack.h (96%) rename src/ripple/{module => }/core/LoadMonitor.h (95%) rename src/ripple/{module/core => core/impl}/Config.cpp (99%) rename src/ripple/{module/core => core/impl}/Job.cpp (98%) rename src/ripple/{module/core => core/impl}/JobQueue.cpp (98%) rename src/ripple/{module/core => core/impl}/LoadEvent.cpp (97%) rename src/ripple/{module/core => core/impl}/LoadFeeTrackImp.cpp (96%) rename src/ripple/{module/core => core/impl}/LoadFeeTrackImp.h (98%) rename src/ripple/{module/core => core/impl}/LoadMonitor.cpp (98%) rename src/ripple/{module => }/data/crypto/Base58Data.cpp (100%) rename src/ripple/{module => }/data/crypto/Base58Data.h (98%) rename src/ripple/{module => }/data/crypto/CKey.cpp (100%) rename src/ripple/{module => }/data/crypto/CKey.h (100%) rename src/ripple/{module => }/data/crypto/CKeyDeterministic.cpp (100%) rename src/ripple/{module => }/data/crypto/CKeyECIES.cpp (100%) rename src/ripple/{module => }/data/crypto/RFC1751.cpp (100%) rename src/ripple/{module => }/data/crypto/RFC1751.h (100%) rename src/ripple/{module => }/data/protocol/BuildInfo.cpp (100%) rename src/ripple/{module => }/data/protocol/BuildInfo.h (100%) rename src/ripple/{module => }/data/protocol/HashPrefix.cpp (100%) rename src/ripple/{module => }/data/protocol/HashPrefix.h (100%) rename src/ripple/{module => }/data/protocol/KnownFormats.h (100%) rename src/ripple/{module => }/data/protocol/LedgerFormats.cpp (100%) rename src/ripple/{module => }/data/protocol/LedgerFormats.h (100%) rename src/ripple/{module => }/data/protocol/Protocol.h (98%) rename src/ripple/{module => }/data/protocol/RippleAddress.cpp (99%) rename src/ripple/{module => }/data/protocol/RippleAddress.h (94%) rename src/ripple/{module => }/data/protocol/RippleSystem.h (100%) rename src/ripple/{module => }/data/protocol/SField.cpp (99%) rename src/ripple/{module => }/data/protocol/SField.h (99%) rename src/ripple/{module => }/data/protocol/STAmount.cpp (99%) rename src/ripple/{module => }/data/protocol/STAmount.h (98%) rename src/ripple/{module => }/data/protocol/STAmount.test.cpp (99%) rename src/ripple/{module => }/data/protocol/STArray.cpp (99%) rename src/ripple/{module => }/data/protocol/STArray.h (98%) rename src/ripple/{module => }/data/protocol/STBitString.h (98%) rename src/ripple/{module => }/data/protocol/STInteger.cpp (97%) rename src/ripple/{module => }/data/protocol/STInteger.h (97%) rename src/ripple/{module => }/data/protocol/STObject.cpp (99%) rename src/ripple/{module => }/data/protocol/STObject.h (99%) rename src/ripple/{module => }/data/protocol/STParsedJSON.cpp (99%) rename src/ripple/{module => }/data/protocol/STParsedJSON.h (100%) rename src/ripple/{module => }/data/protocol/SerializedObjectTemplate.cpp (100%) rename src/ripple/{module => }/data/protocol/SerializedObjectTemplate.h (100%) rename src/ripple/{module => }/data/protocol/SerializedType.h (98%) rename src/ripple/{module => }/data/protocol/SerializedTypes.cpp (99%) rename src/ripple/{module => }/data/protocol/SerializedTypes.h (97%) rename src/ripple/{module => }/data/protocol/Serializer.cpp (99%) rename src/ripple/{module => }/data/protocol/Serializer.h (100%) rename src/ripple/{module => }/data/protocol/TER.cpp (99%) rename src/ripple/{module => }/data/protocol/TER.h (100%) rename src/ripple/{module => }/data/protocol/TxFlags.h (100%) rename src/ripple/{module => }/data/protocol/TxFormats.cpp (100%) rename src/ripple/{module => }/data/protocol/TxFormats.h (100%) rename src/ripple/{module => }/data/utility/UptimeTimerAdapter.h (96%) rename src/ripple/{module/net/basics => net}/HTTPClient.h (95%) rename src/ripple/{module/net/basics => net}/HTTPRequest.h (97%) rename src/ripple/{module/net/rpc => net}/InfoSub.h (96%) rename src/ripple/{module/net/rpc => net}/RPCCall.h (100%) rename src/ripple/{module/net/basics => net}/RPCDoor.h (97%) rename src/ripple/{module/net/rpc => net}/RPCErr.h (100%) rename src/ripple/{module/net/basics => net}/RPCServer.h (100%) rename src/ripple/{module/net/rpc => net}/RPCSub.h (97%) rename src/ripple/{module/net/rpc => net}/RPCUtil.h (100%) rename src/ripple/{module/net/basics => net}/SNTPClient.h (100%) rename src/ripple/{module/net/basics => net/impl}/HTTPClient.cpp (98%) rename src/ripple/{module/net/basics => net/impl}/HTTPRequest.cpp (97%) rename src/ripple/{module/net/rpc => net/impl}/InfoSub.cpp (98%) rename src/ripple/{module/net/rpc => net/impl}/RPCCall.cpp (99%) rename src/ripple/{module/net/basics => net/impl}/RPCDoor.cpp (98%) rename src/ripple/{module/net/rpc => net/impl}/RPCErr.cpp (100%) rename src/ripple/{module/net/basics => net}/impl/RPCServerImp.h (97%) rename src/ripple/{module/net/rpc => net/impl}/RPCSub.cpp (98%) rename src/ripple/{module/net/rpc => net/impl}/RPCUtil.cpp (98%) rename src/ripple/{module/net/basics => net/impl}/SNTPClient.cpp (98%) rename src/ripple/peerfinder/{api => }/Callback.h (96%) rename src/ripple/peerfinder/{api => }/Config.h (100%) rename src/ripple/peerfinder/{api => }/Endpoint.h (97%) rename src/ripple/peerfinder/{api => }/Manager.h (97%) rename src/ripple/peerfinder/{api => }/Slot.h (98%) rename src/ripple/peerfinder/{api => }/Types.h (97%) delete mode 100644 src/ripple/radmap/README.md delete mode 100644 src/ripple/radmap/TODO.md delete mode 100644 src/ripple/radmap/api/Tuning.h rename src/ripple/{module => }/rpc/ErrorCodes.h (100%) rename src/ripple/{module => }/rpc/InternalHandler.h (100%) rename src/ripple/{module => }/rpc/Manager.h (97%) rename src/ripple/{module => }/rpc/README.md (100%) rename src/ripple/{module => }/rpc/RPCHandler.h (80%) rename src/ripple/{module => }/rpc/RPCServerHandler.h (100%) rename src/ripple/{module => }/rpc/Request.h (100%) rename src/ripple/{module => }/rpc/TODO.md (100%) rename src/ripple/{module => }/rpc/Tuning.h (100%) rename src/ripple/{module => }/rpc/handlers/AccountCurrencies.cpp (100%) rename src/ripple/{module => }/rpc/handlers/AccountInfo.cpp (100%) rename src/ripple/{module => }/rpc/handlers/AccountLines.cpp (100%) rename src/ripple/{module => }/rpc/handlers/AccountOffers.cpp (100%) rename src/ripple/{module => }/rpc/handlers/AccountTx.cpp (100%) rename src/ripple/{module => }/rpc/handlers/AccountTxOld.cpp (100%) rename src/ripple/{module => }/rpc/handlers/AccountTxSwitch.cpp (100%) rename src/ripple/{module => }/rpc/handlers/BlackList.cpp (100%) rename src/ripple/{module => }/rpc/handlers/BookOffers.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Connect.cpp (100%) rename src/ripple/{module => }/rpc/handlers/ConsensusInfo.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Feature.cpp (100%) rename src/ripple/{module => }/rpc/handlers/FetchInfo.cpp (100%) rename src/ripple/{module => }/rpc/handlers/GetCounts.cpp (99%) rename src/ripple/{module => }/rpc/handlers/Handlers.h (100%) rename src/ripple/{module => }/rpc/handlers/Internal.cpp (97%) rename src/ripple/{module => }/rpc/handlers/Ledger.cpp (100%) rename src/ripple/{module => }/rpc/handlers/LedgerAccept.cpp (100%) rename src/ripple/{module => }/rpc/handlers/LedgerCleaner.cpp (100%) rename src/ripple/{module => }/rpc/handlers/LedgerClosed.cpp (100%) rename src/ripple/{module => }/rpc/handlers/LedgerCurrent.cpp (100%) rename src/ripple/{module => }/rpc/handlers/LedgerData.cpp (100%) rename src/ripple/{module => }/rpc/handlers/LedgerEntry.cpp (100%) rename src/ripple/{module => }/rpc/handlers/LedgerHeader.cpp (100%) rename src/ripple/{module => }/rpc/handlers/LedgerRequest.cpp (100%) rename src/ripple/{module => }/rpc/handlers/LogLevel.cpp (100%) rename src/ripple/{module => }/rpc/handlers/LogRotate.cpp (100%) rename src/ripple/{module => }/rpc/handlers/OwnerInfo.cpp (100%) rename src/ripple/{module => }/rpc/handlers/PathFind.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Peers.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Ping.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Print.cpp (100%) rename src/ripple/{module => }/rpc/handlers/ProofCreate.cpp (97%) rename src/ripple/{module => }/rpc/handlers/ProofSolve.cpp (100%) rename src/ripple/{module => }/rpc/handlers/ProofVerify.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Random.cpp (100%) rename src/ripple/{module => }/rpc/handlers/RipplePathFind.cpp (99%) rename src/ripple/{module => }/rpc/handlers/SMS.cpp (100%) rename src/ripple/{module => }/rpc/handlers/ServerInfo.cpp (100%) rename src/ripple/{module => }/rpc/handlers/ServerState.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Sign.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Stop.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Submit.cpp (98%) rename src/ripple/{module => }/rpc/handlers/Subscribe.cpp (100%) rename src/ripple/{module => }/rpc/handlers/TransactionEntry.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Tx.cpp (100%) rename src/ripple/{module => }/rpc/handlers/TxHistory.cpp (100%) rename src/ripple/{module => }/rpc/handlers/UnlAdd.cpp (100%) rename src/ripple/{module => }/rpc/handlers/UnlDelete.cpp (100%) rename src/ripple/{module => }/rpc/handlers/UnlList.cpp (100%) rename src/ripple/{module => }/rpc/handlers/UnlLoad.cpp (100%) rename src/ripple/{module => }/rpc/handlers/UnlNetwork.cpp (100%) rename src/ripple/{module => }/rpc/handlers/UnlReset.cpp (100%) rename src/ripple/{module => }/rpc/handlers/UnlScore.cpp (100%) rename src/ripple/{module => }/rpc/handlers/Unsubscribe.cpp (100%) rename src/ripple/{module => }/rpc/handlers/ValidationCreate.cpp (100%) rename src/ripple/{module => }/rpc/handlers/ValidationSeed.cpp (100%) rename src/ripple/{module => }/rpc/handlers/WalletAccounts.cpp (100%) rename src/ripple/{module => }/rpc/handlers/WalletPropose.cpp (100%) rename src/ripple/{module => }/rpc/handlers/WalletSeed.cpp (100%) rename src/ripple/{module => }/rpc/impl/AccountFromString.cpp (98%) rename src/ripple/{module => }/rpc/impl/AccountFromString.h (100%) rename src/ripple/{module => }/rpc/impl/Accounts.cpp (97%) rename src/ripple/{module => }/rpc/impl/Accounts.h (100%) rename src/ripple/{module => }/rpc/impl/Authorize.cpp (99%) rename src/ripple/{module => }/rpc/impl/Authorize.h (100%) rename src/ripple/{module => }/rpc/impl/Command.h (100%) rename src/ripple/{module => }/rpc/impl/Context.h (97%) rename src/ripple/{module => }/rpc/impl/DoPrint.h (100%) rename src/ripple/{module => }/rpc/impl/ErrorCodes.cpp (99%) rename src/ripple/{module => }/rpc/impl/GetMasterGenerator.cpp (97%) rename src/ripple/{module => }/rpc/impl/GetMasterGenerator.h (100%) rename src/ripple/{module => }/rpc/impl/Handler.cpp (98%) rename src/ripple/{module => }/rpc/impl/Handler.h (95%) rename src/ripple/{module => }/rpc/impl/LegacyPathFind.cpp (95%) rename src/ripple/{module => }/rpc/impl/LegacyPathFind.h (100%) rename src/ripple/{module => }/rpc/impl/LookupLedger.cpp (99%) rename src/ripple/{module => }/rpc/impl/LookupLedger.h (100%) rename src/ripple/{module => }/rpc/impl/Manager.cpp (96%) rename src/ripple/{module => }/rpc/impl/ParseAccountIds.cpp (96%) rename src/ripple/{module => }/rpc/impl/ParseAccountIds.h (100%) rename src/ripple/{module => }/rpc/impl/RPCHandler.cpp (95%) rename src/ripple/{module => }/rpc/impl/RPCServerHandler.cpp (95%) rename src/ripple/{module => }/rpc/impl/TransactionSign.cpp (99%) rename src/ripple/{module => }/rpc/impl/TransactionSign.h (100%) rename src/ripple/sslutil/{api => }/CAutoBN_CTX.h (97%) rename src/ripple/sslutil/{api => }/CBigNum.h (100%) rename src/ripple/sslutil/{api => }/DHUtil.h (100%) rename src/ripple/sslutil/{api => }/ECDSACanonical.h (100%) rename src/ripple/sslutil/{api => }/bignum_error.h (100%) rename src/ripple/types/{api => }/AgedHistory.h (100%) rename src/ripple/types/{api => }/Base58.h (99%) rename src/ripple/types/{api => }/Blob.h (100%) rename src/ripple/types/{api => }/Book.h (99%) rename src/ripple/types/{api => }/ByteOrder.h (100%) rename src/ripple/types/{api => }/CryptoIdentifier.h (98%) rename src/ripple/types/{api => }/HashMaps.h (100%) rename src/ripple/types/{api => }/IdentifierStorage.h (100%) rename src/ripple/types/{api => }/IdentifierType.h (100%) rename src/ripple/types/{api => }/Issue.h (99%) rename src/ripple/types/{api => }/RandomNumbers.h (100%) rename src/ripple/types/{api => }/RippleAccountID.h (96%) rename src/ripple/types/{api => }/RippleAccountPrivateKey.h (97%) rename src/ripple/types/{api => }/RippleAccountPublicKey.h (97%) rename src/ripple/types/{api => }/RippleLedgerHash.h (97%) rename src/ripple/types/{api => }/RipplePrivateKey.h (96%) rename src/ripple/types/{api => }/RipplePublicKey.h (94%) rename src/ripple/types/{api => }/RipplePublicKeyHash.h (97%) rename src/ripple/types/{api => }/SimpleIdentifier.h (98%) delete mode 100644 src/ripple/types/TODO.md rename src/ripple/types/{api => }/UInt160.h (96%) rename src/ripple/types/{api => }/UintTypes.h (98%) rename src/ripple/types/{api => }/base_uint.h (99%) rename src/ripple/types/{api => }/strHex.h (100%) delete mode 100644 src/ripple/unity/basics.h delete mode 100644 src/ripple/unity/peerfinder.h delete mode 100644 src/ripple/unity/radmap.cpp rename src/ripple/{module => }/websocket/autosocket/AutoSocket.cpp (100%) rename src/ripple/{module => }/websocket/autosocket/AutoSocket.h (97%) rename src/ripple/{module => }/websocket/autosocket/LogWebsockets.cpp (100%) diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index 51c4243aac..abb06345fa 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -1814,67 +1814,568 @@ - + - + + + + + True - - - - - + True - - - - - - - + True - - - - - + True - + - + - + + + + + True - - - + True - + - + True - + - + True - + - - - + True - + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + + + True + + + + + True + + + + + + + True + + + + + True + + + + + True + + + + + True + + + True + + + + + True + + + + + True + + + + + + + True + + + + + + + True + + + True + + + + + + + True + + + True + + + + + True + + + + + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + True + + + True + + + True + + + + + True + + + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + + + + + + + True + + + + + True + + + + + True + + + True + + + + + True + + + + + + + True + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + + + + + + + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + + + + + + + + + + + + + + + + + + True @@ -1913,6 +2414,159 @@ + + + + + + True + + + True + + + True + + + True + + + True + + + + + True + + + + + + + + + + + + + + + + + + + True + + + + + True + + + + + True + + + True + + + True + + + + + True + + + + + True + + + + + + + True + + + + + + + True + + + + + + + True + + + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + True + + + + + + + True + + + + + True + + + + + True + + + + + True + + + + + + + True + + + + + True @@ -1983,971 +2637,55 @@ - + - + - - - - True - - - True - - - True - - - True - - - - - - - - - - - True - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - - - True - - - - - True - - - - - True - - - - - True - - - True - - - - - True - - - - - True - - - - - - - True - - - - - - - True - - - True - - - - - - - True - - - True - - - - - True - - - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - - - True - - - True - - - True - - - - - True - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - - - - - - - True - - - - - True - - - - - True - - - True - - - - - True - - - - - - - True - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - - + True - - - - True - - - - - - - - - - - True - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - True - - - True - - - - - True - - - - - True - - - - - - - True - - - - - - - True - - - - - - - True - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - True - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - - - True - - - - - - - True - - - - - True - - - - - - - True - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - + True - + True - + True - + True - + True - - True - - - True - - - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - - - True - - - - - True - - - - - - - - - True - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - True - - + - + True - + True - + True - + - + - + - + - + - + - + - - True - - + - - True - @@ -3096,17 +2834,11 @@ True - + - + - - - - - - - + True @@ -3149,8 +2881,6 @@ True - - True @@ -3181,6 +2911,8 @@ + + @@ -3198,6 +2930,10 @@ + + + + Document protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) @@ -3210,13 +2946,6 @@ protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) false - - - - - - True - @@ -3263,6 +2992,260 @@ + + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + True + + + + + True + + + + + + + + + True + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + True + + + + + True + + + True + + + True + + + + + + + + + + + + + + + @@ -3284,15 +3267,15 @@ True - + - + - + - + - + True @@ -3326,51 +3309,25 @@ True - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + True @@ -3393,6 +3350,32 @@ True + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3417,8 +3400,6 @@ - - @@ -3461,14 +3442,8 @@ - - - - - - @@ -3570,6 +3545,14 @@ + + True + + + + + True + True diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index e51d83de8f..5896d44113 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -298,29 +298,62 @@ {C99E2B0C-64FF-A4A9-6FCF-DF19BE8E4C66} - - {46124C23-83D3-80EB-CBBD-E2ED73707D92} + + {83B96C00-A786-6597-826D-E12FA6187AA8} - - {D3D1BF8B-B98E-EA13-7D8C-F0C3243E99F5} + + {CF12850B-61AB-9C37-8207-244E2B423F49} + + + {CB561DDF-F527-E786-2658-1DD3A1D96016} + + + {CDD9E745-5F22-6C78-9A58-B91820E0EBEB} + + + {0E8BC18A-9853-B13E-1A9D-C55FA29DA60F} + + + {44B63F90-BC60-A7C7-24A1-632A358E285B} + + + {CE126498-A44D-30A2-345B-0F672BCDF947} + + + {91D5931B-D981-52BC-BC12-08DA9F7BF606} + + + {5A1509B2-871B-A7AC-1E60-544D3F398741} + + + {0FCD3973-E9A6-7172-C8A3-C3401E1A03DD} + + + {03533509-DAC6-636F-9F7E-288894549E95} + + + {9AD8D049-10A8-704C-D51A-FAD55B1F235F} + + + {07831F2A-6752-E81C-87AF-4D47D425BE8E} + + + {091DDFB4-76F4-04FB-2787-D51B4A44185E} + + + {418BEF0D-AAAB-C368-7D9E-0A97636DE5A6} + + + {50FDCDC1-EC9C-9F3B-34C9-EF4137E132B4} + + + {CE578C3A-4F3A-7E66-FFC5-0C94982FB975} {B8720E2F-21B1-2847-F96C-4E00A45DC639} - - {2F620E10-3275-8530-CE66-F28EDCDF96CD} - - - {993B768B-5F1D-066B-0C4E-B567A82ED0E5} - - - {290E79AD-FABB-AC30-3C05-3F6DE4827C28} - - - {E7D662E4-22C4-15C5-0AE6-C3AACA919EAC} - - - {8C4A62F0-54D0-6DE8-292F-EB5C13E1AFBD} + + {1B5E3484-E132-ADEA-8A38-01B0F4ABAC58} {386F7193-3E90-1C28-75BE-5AE6461046C7} @@ -331,6 +364,24 @@ {2B3171C5-9F59-6210-04BD-2E267A74D1BE} + + {235DCF23-2CF8-4F03-1A54-C159823A7E8D} + + + {D9A8899A-B47C-E5BB-DDF1-32A50545A7D3} + + + {1BC34E8A-BA0B-B540-36B1-3372C411208A} + + + {B1A9A795-C082-6590-D035-B2EDF0FE742C} + + + {06727C83-D304-C785-3D46-E2571F391900} + + + {1906827A-5174-9515-DC11-9D11C511E0CB} + {8601C61D-413C-725E-C9E6-BD4F97E40032} @@ -346,101 +397,11 @@ {32043215-B959-04E5-00FF-F97C7F597235} - - {2629CD62-3FF7-DFB5-786E-9C4298E5D3C3} + + {6649BD29-BE86-723F-501A-045E39310112} - - {B67CFEBD-21EF-1F5E-A967-C1FA9F04ACD8} - - - {BC778155-6FA6-974D-B3A1-22A998EFE268} - - - {1ECE6CBA-1D5B-8B7B-EFCC-4BF87456D113} - - - {0F8122F8-76F1-147B-CA2F-491A22BA6BE6} - - - {28E35C4D-F39A-6C32-60CB-B29F44A08B72} - - - {22718803-3748-7147-16F9-822D9BBFA8DC} - - - {F39A23ED-A7FA-E85E-1421-B51C163D6CFE} - - - {4D836FDB-2124-BD0C-6ABB-1521FB0276D4} - - - {0E28C81F-9891-C3EA-A53D-AC866265B3B7} - - - {6F334F17-2041-3F56-2257-0C04C4D80C22} - - - {4A33F050-B4FA-BECE-FA9B-963BE4AAF1A0} - - - {1ADC0318-326E-565A-CF79-DF72B8D889DB} - - - {08C8AFC4-AE5D-8717-F687-1E7D1900FCC2} - - - {024841C2-163A-155B-A20F-51C5DB694C18} - - - {476493FC-8347-5D46-6D2F-BAF197A199EF} - - - {6E81CB67-9BE8-CC5E-E7B5-D62608A07263} - - - {611381EF-CB49-47DB-5552-F00357947B07} - - - {4DAFFAEC-2D9A-42C0-210F-483796C162E9} - - - {FB5092D7-3AA5-4E7F-F783-C8A929D8B588} - - - {76D34395-C243-7EF7-5A55-43C137431E3D} - - - {B18B2867-7B6F-2A33-38FB-CA6DD7DFBD53} - - - {A784574D-9E82-2B57-C970-D4FBBB4257B5} - - - {157A1E3C-5F58-9B96-B6EE-0C3A6855EE55} - - - {ED7E78C9-AB1B-7DB1-9CD8-0114ED68C8FB} - - - {3A6A7630-8A7E-A012-7CC0-D4ECBBC62321} - - - {643F2F19-8319-49F7-7DF1-4BF4F52BF4BF} - - - {4DB18141-EDCD-D13F-A8D3-407F5EF72217} - - - {9AF7847B-DAB4-9AAA-9CCD-0162235C1FEC} - - - {43D25025-7C0F-AF41-09B8-9CF340BC0277} - - - {D9C63229-EA65-9377-AC44-9C052B5AABB7} - - - {587F434F-850E-8776-A958-745B41B9C407} + + {18A4343E-EF40-5824-86E0-6374708FDDBC} {D3E78215-1C49-D4FB-E9FC-5074083D184F} @@ -466,9 +427,6 @@ {186385AD-A056-FA3A-7E0E-759EB55E9EAB} - - {BB624AF5-3AE8-207D-697C-241600DB6B8D} - {26FDAE33-6FB7-5B19-3F9D-3F635A0C93BA} @@ -478,15 +436,6 @@ {8016685C-6468-9514-D06F-F95060DB5F10} - - {2B05A577-F656-12A6-1A74-29EBB3A52715} - - - {A0D06DC4-0872-CFA8-4E06-502DE3A20C2C} - - - {74549EAE-66F3-2287-9FDD-AD24F03CD054} - {7F5082C0-3323-CAC3-1868-CA49C7F63A34} @@ -496,6 +445,15 @@ {A05858D1-18F0-3A7E-ECFD-7729C370F65B} + + {BCDBB833-2810-D5F5-A023-4E346AD0EED3} + + + {98D31BEB-9D82-93F8-6AC3-70AC5A1EA2E1} + + + {93AC3675-D183-4DB4-021E-8F4CA1586866} + {CB0AC82D-AEA3-F41C-847F-D6ECA4971891} @@ -508,9 +466,6 @@ {C0840101-C28E-ACD4-6862-2178B7E27420} - - {279ED544-0AEF-8713-D429-EB51768BD3F2} - {55CFEEC5-7FF5-F959-9862-9FAE232054B7} @@ -526,9 +481,6 @@ {29DBD04F-9324-A965-5C79-AA06EC10BA58} - - {DE930887-01F9-9500-855F-D091DCBFBFC6} - {2E700221-055D-6F53-BBDE-3949795A358A} @@ -544,6 +496,12 @@ {663AE0EE-6781-C2F4-8D04-0D5D30AC0773} + + {44780F86-42D3-2F2B-0846-5AEE2CA6D7FE} + + + {400881DE-C875-8CE8-E61F-A7992E624248} + {15B4B65A-0F03-7BA9-38CD-42A5712392CB} @@ -2790,84 +2748,678 @@ protobuf\vsprojects - - ripple\algorithm\api + + ripple\app\book - - ripple\basics\containers + + ripple\app\book + + + ripple\app\book + + + ripple\app\book\impl - - ripple\basics\containers - - - ripple\basics\containers - - - ripple\basics\log + + ripple\app\book\impl - - ripple\basics\log - - - ripple\basics\log - - - ripple\basics\system - - - ripple\basics\system + + ripple\app\book\impl - - ripple\basics\system - - - ripple\basics\types - - - ripple\basics\utility + + ripple\app\book\impl - - ripple\basics\utility + + ripple\app\book - - ripple\basics\utility + + ripple\app\book - - ripple\basics\utility + + ripple\app\book + + + ripple\app\book + + + ripple\app\book\tests - - ripple\basics\utility - - - ripple\basics\utility + + ripple\app\book\tests - - ripple\basics\utility + + ripple\app\book - - ripple\basics\utility + + ripple\app\consensus - - ripple\basics\utility + + ripple\app\consensus - - ripple\basics\utility + + ripple\app\consensus - - ripple\basics\utility + + ripple\app\consensus - - ripple\basics\utility - - - ripple\basics\utility + + ripple\app\data - - ripple\basics\utility + + ripple\app\data + + + ripple\app\data + + + ripple\app\data + + + ripple\app\data + + + ripple\app\data + + + ripple\app\data + + + ripple\app\data + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\ledger + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\main + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\misc + + + ripple\app\node + + + ripple\app\node + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths\cursor + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\peers + + + ripple\app\peers + + + ripple\app\peers + + + ripple\app\peers + + + ripple\app\peers + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\shamap + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\transactors + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\tx + + + ripple\app\websocket + + + ripple\app\websocket + + + ripple\app\websocket + + + ripple\app\websocket + + + ripple\app\websocket + + + ripple\app\websocket + + + ripple\basics + + + ripple\basics + + + ripple\basics + + + ripple\basics + + + ripple\basics\impl + + + ripple\basics\impl + + + ripple\basics\impl + + + ripple\basics\impl + + + ripple\basics\impl + + + ripple\basics\impl + + + ripple\basics\impl + + + ripple\basics\impl + + + ripple\basics\impl + + + ripple\basics + + + ripple\basics + + + ripple\basics + + + ripple\basics + + + ripple\basics + + + ripple\basics + + + ripple\basics + + + ripple\basics + + + ripple\basics + + + ripple\basics ripple\common + + ripple\common + ripple\common\impl @@ -2916,6 +3468,195 @@ ripple\common + + ripple\core + + + ripple\core + + + ripple\core\impl + + + ripple\core\impl + + + ripple\core\impl + + + ripple\core\impl + + + ripple\core\impl + + + ripple\core\impl + + + ripple\core\impl + + + ripple\core + + + ripple\core + + + ripple\core + + + ripple\core + + + ripple\core + + + ripple\core + + + ripple\core + + + ripple\core + + + ripple\data\crypto + + + ripple\data\crypto + + + ripple\data\crypto + + + ripple\data\crypto + + + ripple\data\crypto + + + ripple\data\crypto + + + ripple\data\crypto + + + ripple\data\crypto + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\protocol + + + ripple\data\utility + ripple\http\impl @@ -3003,1131 +3744,66 @@ ripple\json - - ripple\module\app\book + + ripple\net - - ripple\module\app\book + + ripple\net - - ripple\module\app\book - - - ripple\module\app\book\impl - - - ripple\module\app\book\impl - - - ripple\module\app\book\impl - - - ripple\module\app\book\impl - - - ripple\module\app\book - - - ripple\module\app\book - - - ripple\module\app\book - - - ripple\module\app\book - - - ripple\module\app\book\tests - - - ripple\module\app\book\tests - - - ripple\module\app\book - - - ripple\module\app\consensus - - - ripple\module\app\consensus - - - ripple\module\app\consensus - - - ripple\module\app\consensus - - - ripple\module\app\data - - - ripple\module\app\data - - - ripple\module\app\data - - - ripple\module\app\data - - - ripple\module\app\data - - - ripple\module\app\data - - - ripple\module\app\data - - - ripple\module\app\data - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\ledger - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\main - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc - - - ripple\module\app\misc + + ripple\net\impl - - ripple\module\app\misc - - - ripple\module\app\misc + + ripple\net\impl - - ripple\module\app\misc - - - ripple\module\app\misc + + ripple\net\impl - - ripple\module\app\misc - - - ripple\module\app\misc + + ripple\net\impl - - ripple\module\app\misc - - - ripple\module\app\misc + + ripple\net\impl - - ripple\module\app\misc - - - ripple\module\app\node + + ripple\net\impl - - ripple\module\app\node + + ripple\net\impl - - ripple\module\app\paths\cursor - - - ripple\module\app\paths\cursor - - - ripple\module\app\paths\cursor - - - ripple\module\app\paths\cursor - - - ripple\module\app\paths\cursor + + ripple\net\impl - - ripple\module\app\paths\cursor + + ripple\net\impl - - ripple\module\app\paths\cursor + + ripple\net\impl - - ripple\module\app\paths\cursor + + ripple\net - - ripple\module\app\paths\cursor - - - ripple\module\app\paths\cursor - - - ripple\module\app\paths\cursor - - - ripple\module\app\paths\cursor + + ripple\net - - ripple\module\app\paths - - - ripple\module\app\paths + + ripple\net - - ripple\module\app\paths + + ripple\net - - ripple\module\app\paths - - - ripple\module\app\paths + + ripple\net - - ripple\module\app\paths - - - ripple\module\app\paths + + ripple\net - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\paths - - - ripple\module\app\peers - - - ripple\module\app\peers - - - ripple\module\app\peers - - - ripple\module\app\peers - - - ripple\module\app\peers - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap + + ripple\net - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\shamap - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\transactors - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\tx - - - ripple\module\app\websocket - - - ripple\module\app\websocket - - - ripple\module\app\websocket - - - ripple\module\app\websocket - - - ripple\module\app\websocket - - - ripple\module\app\websocket + + ripple\net - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\core - - - ripple\module\data\crypto - - - ripple\module\data\crypto - - - ripple\module\data\crypto - - - ripple\module\data\crypto - - - ripple\module\data\crypto - - - ripple\module\data\crypto - - - ripple\module\data\crypto - - - ripple\module\data\crypto - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\protocol - - - ripple\module\data\utility - - - ripple\module\net\basics - - - ripple\module\net\basics - - - ripple\module\net\basics - - - ripple\module\net\basics - - - ripple\module\net\basics\impl - - - ripple\module\net\basics - - - ripple\module\net\basics - - - ripple\module\net\basics - - - ripple\module\net\basics - - - ripple\module\net\basics - - - ripple\module\net\rpc - - - ripple\module\net\rpc - - - ripple\module\net\rpc - - - ripple\module\net\rpc - - - ripple\module\net\rpc - - - ripple\module\net\rpc - - - ripple\module\net\rpc - - - ripple\module\net\rpc - - - ripple\module\net\rpc - - - ripple\module\net\rpc - - - ripple\module\rpc - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\handlers - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc\impl - - - ripple\module\rpc - - - ripple\module\rpc - - - ripple\module\rpc - - - ripple\module\rpc - - - ripple\module\rpc - - - ripple\module\rpc - - - ripple\module\websocket\autosocket - - - ripple\module\websocket\autosocket - - - ripple\module\websocket\autosocket - ripple\nodestore @@ -4311,23 +3987,14 @@ ripple\overlay\tests - - ripple\peerfinder\api + + ripple\peerfinder - - ripple\peerfinder\api + + ripple\peerfinder - - ripple\peerfinder\api - - - ripple\peerfinder\api - - - ripple\peerfinder\api - - - ripple\peerfinder\api + + ripple\peerfinder ripple\peerfinder\impl @@ -4380,9 +4047,6 @@ ripple\peerfinder\impl - - ripple\peerfinder\impl - ripple\peerfinder\impl @@ -4422,6 +4086,9 @@ ripple\peerfinder\impl + + ripple\peerfinder + ripple\peerfinder\sim @@ -4446,18 +4113,15 @@ ripple\peerfinder\sim + + ripple\peerfinder + + + ripple\peerfinder + ripple\proto - - ripple\radmap\api - - - ripple\radmap\api - - - ripple\radmap\impl - ripple\resource\api @@ -4518,6 +4182,279 @@ ripple\resource\impl + + ripple\rpc + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\handlers + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc\impl + + + ripple\rpc + + + ripple\rpc + + + ripple\rpc + + + ripple\rpc + + + ripple\rpc + + + ripple\rpc + ripple\sitefiles\api @@ -4545,20 +4482,20 @@ ripple\sitefiles\impl - - ripple\sslutil\api + + ripple\sslutil - - ripple\sslutil\api + + ripple\sslutil - - ripple\sslutil\api + + ripple\sslutil - - ripple\sslutil\api + + ripple\sslutil - - ripple\sslutil\api + + ripple\sslutil ripple\sslutil\impl @@ -4602,74 +4539,35 @@ ripple\testoverlay\impl - - ripple\types\api + + ripple\types - - ripple\types\api + + ripple\types - - ripple\types\api + + ripple\types - - ripple\types\api + + ripple\types - - ripple\types\api + + ripple\types - - ripple\types\api + + ripple\types - - ripple\types\api + + ripple\types - - ripple\types\api + + ripple\types - - ripple\types\api + + ripple\types - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api - - - ripple\types\api + + ripple\types ripple\types\impl @@ -4692,6 +4590,45 @@ ripple\types\impl + + ripple\types + + + ripple\types + + + ripple\types + + + ripple\types + + + ripple\types + + + ripple\types + + + ripple\types + + + ripple\types + + + ripple\types + + + ripple\types + + + ripple\types + + + ripple\types + + + ripple\types + ripple\unity @@ -4728,9 +4665,6 @@ ripple\unity - - ripple\unity - ripple\unity @@ -4785,18 +4719,9 @@ ripple\unity - - ripple\unity - ripple\unity - - ripple\unity - - - ripple\unity - ripple\unity @@ -4929,6 +4854,15 @@ ripple\validators + + ripple\websocket\autosocket + + + ripple\websocket\autosocket + + + ripple\websocket\autosocket + rocksdb2\db diff --git a/SConstruct b/SConstruct index 9bb1ca3e88..5085f470c8 100644 --- a/SConstruct +++ b/SConstruct @@ -559,7 +559,6 @@ for toolchain in all_toolchains: 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)) diff --git a/src/ripple/algorithm/README.md b/src/ripple/algorithm/README.md deleted file mode 100644 index f284353318..0000000000 --- a/src/ripple/algorithm/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Algorithm - -Various utility classes diff --git a/src/ripple/algorithm/TODO.md b/src/ripple/algorithm/TODO.md deleted file mode 100644 index de92446436..0000000000 --- a/src/ripple/algorithm/TODO.md +++ /dev/null @@ -1 +0,0 @@ -# Algorithm TODO diff --git a/src/ripple/module/app/TODO.md b/src/ripple/app/TODO.md similarity index 100% rename from src/ripple/module/app/TODO.md rename to src/ripple/app/TODO.md diff --git a/src/ripple/module/app/book/Amount.h b/src/ripple/app/book/Amount.h similarity index 99% rename from src/ripple/module/app/book/Amount.h rename to src/ripple/app/book/Amount.h index acd3747dc7..e5056fc9fe 100644 --- a/src/ripple/module/app/book/Amount.h +++ b/src/ripple/app/book/Amount.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_CORE_AMOUNT_H_INCLUDED #define RIPPLE_CORE_AMOUNT_H_INCLUDED -#include +#include #include #include // diff --git a/src/ripple/module/app/book/Amounts.h b/src/ripple/app/book/Amounts.h similarity index 97% rename from src/ripple/module/app/book/Amounts.h rename to src/ripple/app/book/Amounts.h index bd7b2b7fce..e1a35c0280 100644 --- a/src/ripple/module/app/book/Amounts.h +++ b/src/ripple/app/book/Amounts.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_CORE_AMOUNTS_H_INCLUDED #define RIPPLE_CORE_AMOUNTS_H_INCLUDED -#include +#include #include diff --git a/src/ripple/module/app/book/BookTip.h b/src/ripple/app/book/BookTip.h similarity index 96% rename from src/ripple/module/app/book/BookTip.h rename to src/ripple/app/book/BookTip.h index 5c2de85d0e..dadd12e2fc 100644 --- a/src/ripple/module/app/book/BookTip.h +++ b/src/ripple/app/book/BookTip.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_CORE_BOOKTIP_H_INCLUDED #define RIPPLE_CORE_BOOKTIP_H_INCLUDED -#include -#include +#include +#include #include diff --git a/src/ripple/module/app/book/Offer.h b/src/ripple/app/book/Offer.h similarity index 93% rename from src/ripple/module/app/book/Offer.h rename to src/ripple/app/book/Offer.h index 0400f8b542..ffd25ee44c 100644 --- a/src/ripple/module/app/book/Offer.h +++ b/src/ripple/app/book/Offer.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_CORE_OFFER_H_INCLUDED #define RIPPLE_CORE_OFFER_H_INCLUDED -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include diff --git a/src/ripple/module/app/book/OfferStream.h b/src/ripple/app/book/OfferStream.h similarity index 95% rename from src/ripple/module/app/book/OfferStream.h rename to src/ripple/app/book/OfferStream.h index 36d6dcb2cd..025b6cfcb4 100644 --- a/src/ripple/module/app/book/OfferStream.h +++ b/src/ripple/app/book/OfferStream.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_CORE_OFFERSTREAM_H_INCLUDED #define RIPPLE_CORE_OFFERSTREAM_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/ripple/module/app/book/Quality.h b/src/ripple/app/book/Quality.h similarity index 97% rename from src/ripple/module/app/book/Quality.h rename to src/ripple/app/book/Quality.h index 97bf2a2381..9db92a3b19 100644 --- a/src/ripple/module/app/book/Quality.h +++ b/src/ripple/app/book/Quality.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_CORE_QUALITY_H_INCLUDED #define RIPPLE_CORE_QUALITY_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/module/app/book/Taker.h b/src/ripple/app/book/Taker.h similarity index 95% rename from src/ripple/module/app/book/Taker.h rename to src/ripple/app/book/Taker.h index 3eb01ec9c4..542071bc65 100644 --- a/src/ripple/module/app/book/Taker.h +++ b/src/ripple/app/book/Taker.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_CORE_TAKER_H_INCLUDED #define RIPPLE_CORE_TAKER_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/module/app/book/Types.h b/src/ripple/app/book/Types.h similarity index 94% rename from src/ripple/module/app/book/Types.h rename to src/ripple/app/book/Types.h index 4f40705b9f..6e3b99c167 100644 --- a/src/ripple/module/app/book/Types.h +++ b/src/ripple/app/book/Types.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_CORE_TYPES_H_INCLUDED #define RIPPLE_CORE_TYPES_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/module/app/book/impl/BookTip.cpp b/src/ripple/app/book/impl/BookTip.cpp similarity index 98% rename from src/ripple/module/app/book/impl/BookTip.cpp rename to src/ripple/app/book/impl/BookTip.cpp index 9b8281643d..e8eaebdfaa 100644 --- a/src/ripple/module/app/book/impl/BookTip.cpp +++ b/src/ripple/app/book/impl/BookTip.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace core { diff --git a/src/ripple/module/app/book/impl/OfferStream.cpp b/src/ripple/app/book/impl/OfferStream.cpp similarity index 99% rename from src/ripple/module/app/book/impl/OfferStream.cpp rename to src/ripple/app/book/impl/OfferStream.cpp index 6231370616..db324fb1f7 100644 --- a/src/ripple/module/app/book/impl/OfferStream.cpp +++ b/src/ripple/app/book/impl/OfferStream.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace core { diff --git a/src/ripple/module/app/book/impl/Quality.cpp b/src/ripple/app/book/impl/Quality.cpp similarity index 98% rename from src/ripple/module/app/book/impl/Quality.cpp rename to src/ripple/app/book/impl/Quality.cpp index 334361a740..c418f09a46 100644 --- a/src/ripple/module/app/book/impl/Quality.cpp +++ b/src/ripple/app/book/impl/Quality.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/module/app/book/impl/Taker.cpp b/src/ripple/app/book/impl/Taker.cpp similarity index 99% rename from src/ripple/module/app/book/impl/Taker.cpp rename to src/ripple/app/book/impl/Taker.cpp index 65023864f9..8837cf7aab 100644 --- a/src/ripple/module/app/book/impl/Taker.cpp +++ b/src/ripple/app/book/impl/Taker.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace core { diff --git a/src/ripple/module/app/book/tests/OfferStream.test.cpp b/src/ripple/app/book/tests/OfferStream.test.cpp similarity index 96% rename from src/ripple/module/app/book/tests/OfferStream.test.cpp rename to src/ripple/app/book/tests/OfferStream.test.cpp index 329bcdb253..431e569343 100644 --- a/src/ripple/module/app/book/tests/OfferStream.test.cpp +++ b/src/ripple/app/book/tests/OfferStream.test.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include diff --git a/src/ripple/module/app/book/tests/Quality.test.cpp b/src/ripple/app/book/tests/Quality.test.cpp similarity index 99% rename from src/ripple/module/app/book/tests/Quality.test.cpp rename to src/ripple/app/book/tests/Quality.test.cpp index ffda373473..fd8f305c3d 100644 --- a/src/ripple/module/app/book/tests/Quality.test.cpp +++ b/src/ripple/app/book/tests/Quality.test.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/module/app/consensus/DisputedTx.cpp b/src/ripple/app/consensus/DisputedTx.cpp similarity index 100% rename from src/ripple/module/app/consensus/DisputedTx.cpp rename to src/ripple/app/consensus/DisputedTx.cpp diff --git a/src/ripple/module/app/consensus/DisputedTx.h b/src/ripple/app/consensus/DisputedTx.h similarity index 100% rename from src/ripple/module/app/consensus/DisputedTx.h rename to src/ripple/app/consensus/DisputedTx.h diff --git a/src/ripple/module/app/consensus/LedgerConsensus.cpp b/src/ripple/app/consensus/LedgerConsensus.cpp similarity index 99% rename from src/ripple/module/app/consensus/LedgerConsensus.cpp rename to src/ripple/app/consensus/LedgerConsensus.cpp index 6dc3372d48..f58f120119 100644 --- a/src/ripple/module/app/consensus/LedgerConsensus.cpp +++ b/src/ripple/app/consensus/LedgerConsensus.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include +#include #include -#include +#include namespace ripple { diff --git a/src/ripple/module/app/consensus/LedgerConsensus.h b/src/ripple/app/consensus/LedgerConsensus.h similarity index 100% rename from src/ripple/module/app/consensus/LedgerConsensus.h rename to src/ripple/app/consensus/LedgerConsensus.h diff --git a/src/ripple/module/app/data/DBInit.cpp b/src/ripple/app/data/DBInit.cpp similarity index 100% rename from src/ripple/module/app/data/DBInit.cpp rename to src/ripple/app/data/DBInit.cpp diff --git a/src/ripple/module/app/data/DBInit.h b/src/ripple/app/data/DBInit.h similarity index 100% rename from src/ripple/module/app/data/DBInit.h rename to src/ripple/app/data/DBInit.h diff --git a/src/ripple/module/app/data/Database.cpp b/src/ripple/app/data/Database.cpp similarity index 100% rename from src/ripple/module/app/data/Database.cpp rename to src/ripple/app/data/Database.cpp diff --git a/src/ripple/module/app/data/Database.h b/src/ripple/app/data/Database.h similarity index 100% rename from src/ripple/module/app/data/Database.h rename to src/ripple/app/data/Database.h diff --git a/src/ripple/module/app/data/DatabaseCon.cpp b/src/ripple/app/data/DatabaseCon.cpp similarity index 100% rename from src/ripple/module/app/data/DatabaseCon.cpp rename to src/ripple/app/data/DatabaseCon.cpp diff --git a/src/ripple/module/app/data/DatabaseCon.h b/src/ripple/app/data/DatabaseCon.h similarity index 100% rename from src/ripple/module/app/data/DatabaseCon.h rename to src/ripple/app/data/DatabaseCon.h diff --git a/src/ripple/module/app/data/SqliteDatabase.cpp b/src/ripple/app/data/SqliteDatabase.cpp similarity index 100% rename from src/ripple/module/app/data/SqliteDatabase.cpp rename to src/ripple/app/data/SqliteDatabase.cpp diff --git a/src/ripple/module/app/data/SqliteDatabase.h b/src/ripple/app/data/SqliteDatabase.h similarity index 100% rename from src/ripple/module/app/data/SqliteDatabase.h rename to src/ripple/app/data/SqliteDatabase.h diff --git a/src/ripple/module/app/ledger/AcceptedLedger.cpp b/src/ripple/app/ledger/AcceptedLedger.cpp similarity index 100% rename from src/ripple/module/app/ledger/AcceptedLedger.cpp rename to src/ripple/app/ledger/AcceptedLedger.cpp diff --git a/src/ripple/module/app/ledger/AcceptedLedger.h b/src/ripple/app/ledger/AcceptedLedger.h similarity index 100% rename from src/ripple/module/app/ledger/AcceptedLedger.h rename to src/ripple/app/ledger/AcceptedLedger.h diff --git a/src/ripple/module/app/ledger/AcceptedLedgerTx.cpp b/src/ripple/app/ledger/AcceptedLedgerTx.cpp similarity index 97% rename from src/ripple/module/app/ledger/AcceptedLedgerTx.cpp rename to src/ripple/app/ledger/AcceptedLedgerTx.cpp index d28301d29e..8e8decb2b6 100644 --- a/src/ripple/module/app/ledger/AcceptedLedgerTx.cpp +++ b/src/ripple/app/ledger/AcceptedLedgerTx.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include + namespace ripple { AcceptedLedgerTx::AcceptedLedgerTx (Ledger::ref ledger, SerializerIterator& sit) diff --git a/src/ripple/module/app/ledger/AcceptedLedgerTx.h b/src/ripple/app/ledger/AcceptedLedgerTx.h similarity index 100% rename from src/ripple/module/app/ledger/AcceptedLedgerTx.h rename to src/ripple/app/ledger/AcceptedLedgerTx.h diff --git a/src/ripple/module/app/ledger/BookListeners.cpp b/src/ripple/app/ledger/BookListeners.cpp similarity index 100% rename from src/ripple/module/app/ledger/BookListeners.cpp rename to src/ripple/app/ledger/BookListeners.cpp diff --git a/src/ripple/module/app/ledger/BookListeners.h b/src/ripple/app/ledger/BookListeners.h similarity index 100% rename from src/ripple/module/app/ledger/BookListeners.h rename to src/ripple/app/ledger/BookListeners.h diff --git a/src/ripple/module/app/ledger/DirectoryEntryIterator.cpp b/src/ripple/app/ledger/DirectoryEntryIterator.cpp similarity index 100% rename from src/ripple/module/app/ledger/DirectoryEntryIterator.cpp rename to src/ripple/app/ledger/DirectoryEntryIterator.cpp diff --git a/src/ripple/module/app/ledger/DirectoryEntryIterator.h b/src/ripple/app/ledger/DirectoryEntryIterator.h similarity index 100% rename from src/ripple/module/app/ledger/DirectoryEntryIterator.h rename to src/ripple/app/ledger/DirectoryEntryIterator.h diff --git a/src/ripple/module/app/ledger/InboundLedger.cpp b/src/ripple/app/ledger/InboundLedger.cpp similarity index 100% rename from src/ripple/module/app/ledger/InboundLedger.cpp rename to src/ripple/app/ledger/InboundLedger.cpp diff --git a/src/ripple/module/app/ledger/InboundLedger.h b/src/ripple/app/ledger/InboundLedger.h similarity index 100% rename from src/ripple/module/app/ledger/InboundLedger.h rename to src/ripple/app/ledger/InboundLedger.h diff --git a/src/ripple/module/app/ledger/InboundLedgers.cpp b/src/ripple/app/ledger/InboundLedgers.cpp similarity index 100% rename from src/ripple/module/app/ledger/InboundLedgers.cpp rename to src/ripple/app/ledger/InboundLedgers.cpp diff --git a/src/ripple/module/app/ledger/InboundLedgers.h b/src/ripple/app/ledger/InboundLedgers.h similarity index 98% rename from src/ripple/module/app/ledger/InboundLedgers.h rename to src/ripple/app/ledger/InboundLedgers.h index dbf1d07ba1..09b6cd1f75 100644 --- a/src/ripple/module/app/ledger/InboundLedgers.h +++ b/src/ripple/app/ledger/InboundLedgers.h @@ -20,6 +20,7 @@ #ifndef RIPPLE_INBOUNDLEDGERS_H #define RIPPLE_INBOUNDLEDGERS_H +#include #include // namespace ripple { diff --git a/src/ripple/module/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp similarity index 99% rename from src/ripple/module/app/ledger/Ledger.cpp rename to src/ripple/app/ledger/Ledger.cpp index 9c26df221c..a5d7d95ade 100644 --- a/src/ripple/module/app/ledger/Ledger.cpp +++ b/src/ripple/app/ledger/Ledger.cpp @@ -17,12 +17,15 @@ */ //============================================================================== -#include +#include +#include +#include #include -#include -#include +#include +#include #include #include +#include namespace ripple { diff --git a/src/ripple/module/app/ledger/Ledger.h b/src/ripple/app/ledger/Ledger.h similarity index 100% rename from src/ripple/module/app/ledger/Ledger.h rename to src/ripple/app/ledger/Ledger.h diff --git a/src/ripple/module/app/ledger/LedgerCleaner.cpp b/src/ripple/app/ledger/LedgerCleaner.cpp similarity index 99% rename from src/ripple/module/app/ledger/LedgerCleaner.cpp rename to src/ripple/app/ledger/LedgerCleaner.cpp index e6ddc2cd30..82bd055bc8 100644 --- a/src/ripple/module/app/ledger/LedgerCleaner.cpp +++ b/src/ripple/app/ledger/LedgerCleaner.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include // namespace ripple { diff --git a/src/ripple/module/app/ledger/LedgerCleaner.h b/src/ripple/app/ledger/LedgerCleaner.h similarity index 96% rename from src/ripple/module/app/ledger/LedgerCleaner.h rename to src/ripple/app/ledger/LedgerCleaner.h index 5f87c5b3bd..7801d94c47 100644 --- a/src/ripple/module/app/ledger/LedgerCleaner.h +++ b/src/ripple/app/ledger/LedgerCleaner.h @@ -21,6 +21,8 @@ #define RIPPLE_LEDGERCLEANER_H_INCLUDED #include // +#include +#include namespace ripple { diff --git a/src/ripple/module/app/ledger/LedgerEntrySet.cpp b/src/ripple/app/ledger/LedgerEntrySet.cpp similarity index 99% rename from src/ripple/module/app/ledger/LedgerEntrySet.cpp rename to src/ripple/app/ledger/LedgerEntrySet.cpp index c8ed632c16..b9497f5667 100644 --- a/src/ripple/module/app/ledger/LedgerEntrySet.cpp +++ b/src/ripple/app/ledger/LedgerEntrySet.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/app/ledger/LedgerEntrySet.h b/src/ripple/app/ledger/LedgerEntrySet.h similarity index 100% rename from src/ripple/module/app/ledger/LedgerEntrySet.h rename to src/ripple/app/ledger/LedgerEntrySet.h diff --git a/src/ripple/module/app/ledger/LedgerHistory.cpp b/src/ripple/app/ledger/LedgerHistory.cpp similarity index 100% rename from src/ripple/module/app/ledger/LedgerHistory.cpp rename to src/ripple/app/ledger/LedgerHistory.cpp diff --git a/src/ripple/module/app/ledger/LedgerHistory.h b/src/ripple/app/ledger/LedgerHistory.h similarity index 100% rename from src/ripple/module/app/ledger/LedgerHistory.h rename to src/ripple/app/ledger/LedgerHistory.h diff --git a/src/ripple/module/app/ledger/LedgerHolder.h b/src/ripple/app/ledger/LedgerHolder.h similarity index 100% rename from src/ripple/module/app/ledger/LedgerHolder.h rename to src/ripple/app/ledger/LedgerHolder.h diff --git a/src/ripple/module/app/ledger/LedgerMaster.cpp b/src/ripple/app/ledger/LedgerMaster.cpp similarity index 99% rename from src/ripple/module/app/ledger/LedgerMaster.cpp rename to src/ripple/app/ledger/LedgerMaster.cpp index 25498fe825..495497f58a 100644 --- a/src/ripple/module/app/ledger/LedgerMaster.cpp +++ b/src/ripple/app/ledger/LedgerMaster.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include #include // diff --git a/src/ripple/module/app/ledger/LedgerMaster.h b/src/ripple/app/ledger/LedgerMaster.h similarity index 97% rename from src/ripple/module/app/ledger/LedgerMaster.h rename to src/ripple/app/ledger/LedgerMaster.h index a3e2058a7e..6953d2ec67 100644 --- a/src/ripple/module/app/ledger/LedgerMaster.h +++ b/src/ripple/app/ledger/LedgerMaster.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_LEDGERMASTER_H_INCLUDED #define RIPPLE_LEDGERMASTER_H_INCLUDED -// VFALCO TODO Make a header that forward declares Collector and -// its smart pointer container a-la boost. -// +#include #include +#include +#include namespace ripple { diff --git a/src/ripple/module/app/ledger/LedgerProposal.cpp b/src/ripple/app/ledger/LedgerProposal.cpp similarity index 99% rename from src/ripple/module/app/ledger/LedgerProposal.cpp rename to src/ripple/app/ledger/LedgerProposal.cpp index 3894e19523..7d6241145e 100644 --- a/src/ripple/module/app/ledger/LedgerProposal.cpp +++ b/src/ripple/app/ledger/LedgerProposal.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/app/ledger/LedgerProposal.h b/src/ripple/app/ledger/LedgerProposal.h similarity index 100% rename from src/ripple/module/app/ledger/LedgerProposal.h rename to src/ripple/app/ledger/LedgerProposal.h diff --git a/src/ripple/module/app/ledger/LedgerTiming.cpp b/src/ripple/app/ledger/LedgerTiming.cpp similarity index 100% rename from src/ripple/module/app/ledger/LedgerTiming.cpp rename to src/ripple/app/ledger/LedgerTiming.cpp diff --git a/src/ripple/module/app/ledger/LedgerTiming.h b/src/ripple/app/ledger/LedgerTiming.h similarity index 100% rename from src/ripple/module/app/ledger/LedgerTiming.h rename to src/ripple/app/ledger/LedgerTiming.h diff --git a/src/ripple/module/app/ledger/OrderBookDB.cpp b/src/ripple/app/ledger/OrderBookDB.cpp similarity index 100% rename from src/ripple/module/app/ledger/OrderBookDB.cpp rename to src/ripple/app/ledger/OrderBookDB.cpp diff --git a/src/ripple/module/app/ledger/OrderBookDB.h b/src/ripple/app/ledger/OrderBookDB.h similarity index 98% rename from src/ripple/module/app/ledger/OrderBookDB.h rename to src/ripple/app/ledger/OrderBookDB.h index 64e797bf12..b6c938ccf1 100644 --- a/src/ripple/module/app/ledger/OrderBookDB.h +++ b/src/ripple/app/ledger/OrderBookDB.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_ORDERBOOKDB_H_INCLUDED #define RIPPLE_ORDERBOOKDB_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/module/app/ledger/OrderBookIterator.cpp b/src/ripple/app/ledger/OrderBookIterator.cpp similarity index 100% rename from src/ripple/module/app/ledger/OrderBookIterator.cpp rename to src/ripple/app/ledger/OrderBookIterator.cpp diff --git a/src/ripple/module/app/ledger/OrderBookIterator.h b/src/ripple/app/ledger/OrderBookIterator.h similarity index 100% rename from src/ripple/module/app/ledger/OrderBookIterator.h rename to src/ripple/app/ledger/OrderBookIterator.h diff --git a/src/ripple/module/app/ledger/README.md b/src/ripple/app/ledger/README.md similarity index 100% rename from src/ripple/module/app/ledger/README.md rename to src/ripple/app/ledger/README.md diff --git a/src/ripple/module/app/ledger/SerializedValidation.cpp b/src/ripple/app/ledger/SerializedValidation.cpp similarity index 99% rename from src/ripple/module/app/ledger/SerializedValidation.cpp rename to src/ripple/app/ledger/SerializedValidation.cpp index 620064cb42..ad2159a9c0 100644 --- a/src/ripple/module/app/ledger/SerializedValidation.cpp +++ b/src/ripple/app/ledger/SerializedValidation.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/app/ledger/SerializedValidation.h b/src/ripple/app/ledger/SerializedValidation.h similarity index 100% rename from src/ripple/module/app/ledger/SerializedValidation.h rename to src/ripple/app/ledger/SerializedValidation.h diff --git a/src/ripple/module/app/ledger/TODO.md b/src/ripple/app/ledger/TODO.md similarity index 100% rename from src/ripple/module/app/ledger/TODO.md rename to src/ripple/app/ledger/TODO.md diff --git a/src/ripple/module/app/main/Application.cpp b/src/ripple/app/main/Application.cpp similarity index 99% rename from src/ripple/module/app/main/Application.cpp rename to src/ripple/app/main/Application.cpp index 1beb4d66d2..fb7b5e372f 100644 --- a/src/ripple/module/app/main/Application.cpp +++ b/src/ripple/app/main/Application.cpp @@ -17,20 +17,21 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include +#include +#include #include namespace ripple { diff --git a/src/ripple/module/app/main/Application.h b/src/ripple/app/main/Application.h similarity index 99% rename from src/ripple/module/app/main/Application.h rename to src/ripple/app/main/Application.h index aabc9220e3..4587d568a0 100644 --- a/src/ripple/module/app/main/Application.h +++ b/src/ripple/app/main/Application.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_APPLICATION_H_INCLUDED #define RIPPLE_APP_APPLICATION_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/radmap/impl/BasicFullBelowCache.cpp b/src/ripple/app/main/BasicFullBelowCache.cpp similarity index 100% rename from src/ripple/radmap/impl/BasicFullBelowCache.cpp rename to src/ripple/app/main/BasicFullBelowCache.cpp diff --git a/src/ripple/radmap/api/BasicFullBelowCache.h b/src/ripple/app/main/BasicFullBelowCache.h similarity index 98% rename from src/ripple/radmap/api/BasicFullBelowCache.h rename to src/ripple/app/main/BasicFullBelowCache.h index 3bd881586a..a99c19f3e8 100644 --- a/src/ripple/radmap/api/BasicFullBelowCache.h +++ b/src/ripple/app/main/BasicFullBelowCache.h @@ -20,14 +20,11 @@ #ifndef RIPPLE_RADMAP_BASICFULLBELOWCACHE_H_INCLUDED #define RIPPLE_RADMAP_BASICFULLBELOWCACHE_H_INCLUDED +#include +#include #include -#include - -#include - namespace ripple { -namespace RadMap { /** Remembers which tree keys have all descendants resident. This optimizes the process of acquiring a complete tree. @@ -111,7 +108,6 @@ private: KeyCache m_cache; }; -} } #endif diff --git a/src/ripple/module/app/main/CollectorManager.cpp b/src/ripple/app/main/CollectorManager.cpp similarity index 97% rename from src/ripple/module/app/main/CollectorManager.cpp rename to src/ripple/app/main/CollectorManager.cpp index 9975708a45..2b32ceb180 100644 --- a/src/ripple/module/app/main/CollectorManager.cpp +++ b/src/ripple/app/main/CollectorManager.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/app/main/CollectorManager.h b/src/ripple/app/main/CollectorManager.h similarity index 100% rename from src/ripple/module/app/main/CollectorManager.h rename to src/ripple/app/main/CollectorManager.h diff --git a/src/ripple/module/app/main/FatalErrorReporter.cpp b/src/ripple/app/main/FatalErrorReporter.cpp similarity index 95% rename from src/ripple/module/app/main/FatalErrorReporter.cpp rename to src/ripple/app/main/FatalErrorReporter.cpp index bea56ccb1a..ed09d6ed41 100644 --- a/src/ripple/module/app/main/FatalErrorReporter.cpp +++ b/src/ripple/app/main/FatalErrorReporter.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/module/app/main/FatalErrorReporter.h b/src/ripple/app/main/FatalErrorReporter.h similarity index 100% rename from src/ripple/module/app/main/FatalErrorReporter.h rename to src/ripple/app/main/FatalErrorReporter.h diff --git a/src/ripple/module/app/main/FullBelowCache.h b/src/ripple/app/main/FullBelowCache.h similarity index 88% rename from src/ripple/module/app/main/FullBelowCache.h rename to src/ripple/app/main/FullBelowCache.h index 89187a94ce..90840ce361 100644 --- a/src/ripple/module/app/main/FullBelowCache.h +++ b/src/ripple/app/main/FullBelowCache.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_FULLBELOWCACHE_H_INCLUDED #define RIPPLE_FULLBELOWCACHE_H_INCLUDED -#include -#include +#include +#include namespace ripple { -typedef RadMap::BasicFullBelowCache FullBelowCache; +typedef BasicFullBelowCache FullBelowCache; } diff --git a/src/ripple/module/app/main/IoServicePool.cpp b/src/ripple/app/main/IoServicePool.cpp similarity index 98% rename from src/ripple/module/app/main/IoServicePool.cpp rename to src/ripple/app/main/IoServicePool.cpp index 9e553e28b3..6711e5dda4 100644 --- a/src/ripple/module/app/main/IoServicePool.cpp +++ b/src/ripple/app/main/IoServicePool.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include // diff --git a/src/ripple/module/app/main/IoServicePool.h b/src/ripple/app/main/IoServicePool.h similarity index 100% rename from src/ripple/module/app/main/IoServicePool.h rename to src/ripple/app/main/IoServicePool.h diff --git a/src/ripple/module/app/main/LoadManager.cpp b/src/ripple/app/main/LoadManager.cpp similarity index 99% rename from src/ripple/module/app/main/LoadManager.cpp rename to src/ripple/app/main/LoadManager.cpp index 2714b6771c..4c662c66b3 100644 --- a/src/ripple/module/app/main/LoadManager.cpp +++ b/src/ripple/app/main/LoadManager.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include // REMOVE ASAP #include diff --git a/src/ripple/module/app/main/LoadManager.h b/src/ripple/app/main/LoadManager.h similarity index 98% rename from src/ripple/module/app/main/LoadManager.h rename to src/ripple/app/main/LoadManager.h index 84ce224b60..a11371492b 100644 --- a/src/ripple/module/app/main/LoadManager.h +++ b/src/ripple/app/main/LoadManager.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_LOADMANAGER_H_INCLUDED #define RIPPLE_LOADMANAGER_H_INCLUDED +#include + namespace ripple { /** Manages load sources. diff --git a/src/ripple/module/app/main/LocalCredentials.cpp b/src/ripple/app/main/LocalCredentials.cpp similarity index 98% rename from src/ripple/module/app/main/LocalCredentials.cpp rename to src/ripple/app/main/LocalCredentials.cpp index c7d78a45d5..046067f32e 100644 --- a/src/ripple/module/app/main/LocalCredentials.cpp +++ b/src/ripple/app/main/LocalCredentials.cpp @@ -17,7 +17,8 @@ */ //============================================================================== -#include +#include +#include namespace ripple { diff --git a/src/ripple/module/app/main/LocalCredentials.h b/src/ripple/app/main/LocalCredentials.h similarity index 100% rename from src/ripple/module/app/main/LocalCredentials.h rename to src/ripple/app/main/LocalCredentials.h diff --git a/src/ripple/module/app/main/Main.cpp b/src/ripple/app/main/Main.cpp similarity index 98% rename from src/ripple/module/app/main/Main.cpp rename to src/ripple/app/main/Main.cpp index 37e5640bc4..bed4390295 100644 --- a/src/ripple/module/app/main/Main.cpp +++ b/src/ripple/app/main/Main.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/ripple/module/app/main/NodeStoreScheduler.cpp b/src/ripple/app/main/NodeStoreScheduler.cpp similarity index 97% rename from src/ripple/module/app/main/NodeStoreScheduler.cpp rename to src/ripple/app/main/NodeStoreScheduler.cpp index 43e2ad1976..2f5533f429 100644 --- a/src/ripple/module/app/main/NodeStoreScheduler.cpp +++ b/src/ripple/app/main/NodeStoreScheduler.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/app/main/NodeStoreScheduler.h b/src/ripple/app/main/NodeStoreScheduler.h similarity index 98% rename from src/ripple/module/app/main/NodeStoreScheduler.h rename to src/ripple/app/main/NodeStoreScheduler.h index c0a96de78d..3034928599 100644 --- a/src/ripple/module/app/main/NodeStoreScheduler.h +++ b/src/ripple/app/main/NodeStoreScheduler.h @@ -21,7 +21,7 @@ #define RIPPLE_APP_NODESTORESCHEDULER_H_INCLUDED #include -#include +#include #include #include diff --git a/src/ripple/module/app/main/ParameterTable.cpp b/src/ripple/app/main/ParameterTable.cpp similarity index 99% rename from src/ripple/module/app/main/ParameterTable.cpp rename to src/ripple/app/main/ParameterTable.cpp index a89684c51f..795c125ea8 100644 --- a/src/ripple/module/app/main/ParameterTable.cpp +++ b/src/ripple/app/main/ParameterTable.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include namespace ripple { diff --git a/src/ripple/module/app/main/ParameterTable.h b/src/ripple/app/main/ParameterTable.h similarity index 100% rename from src/ripple/module/app/main/ParameterTable.h rename to src/ripple/app/main/ParameterTable.h diff --git a/src/ripple/module/app/main/RPCHTTPServer.cpp b/src/ripple/app/main/RPCHTTPServer.cpp similarity index 98% rename from src/ripple/module/app/main/RPCHTTPServer.cpp rename to src/ripple/app/main/RPCHTTPServer.cpp index b8e9caae0f..2c8567dea3 100644 --- a/src/ripple/module/app/main/RPCHTTPServer.cpp +++ b/src/ripple/app/main/RPCHTTPServer.cpp @@ -19,9 +19,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/app/main/RPCHTTPServer.h b/src/ripple/app/main/RPCHTTPServer.h similarity index 100% rename from src/ripple/module/app/main/RPCHTTPServer.h rename to src/ripple/app/main/RPCHTTPServer.h diff --git a/src/ripple/module/app/main/Tuning.h b/src/ripple/app/main/Tuning.h similarity index 94% rename from src/ripple/module/app/main/Tuning.h rename to src/ripple/app/main/Tuning.h index fe70614b86..10ba8a6815 100644 --- a/src/ripple/module/app/main/Tuning.h +++ b/src/ripple/app/main/Tuning.h @@ -27,6 +27,10 @@ enum fullBelowTargetSize = 524288 ,fullBelowExpirationSeconds = 600 + + ,defaultCacheTargetSize = 0 + + ,defaultCacheExpirationSeconds = 120 }; } diff --git a/src/ripple/module/app/misc/AccountState.cpp b/src/ripple/app/misc/AccountState.cpp similarity index 97% rename from src/ripple/module/app/misc/AccountState.cpp rename to src/ripple/app/misc/AccountState.cpp index bb530fed6e..d53ea40581 100644 --- a/src/ripple/module/app/misc/AccountState.cpp +++ b/src/ripple/app/misc/AccountState.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include + namespace ripple { AccountState::AccountState (RippleAddress const& naAccountID) diff --git a/src/ripple/module/app/misc/AccountState.h b/src/ripple/app/misc/AccountState.h similarity index 100% rename from src/ripple/module/app/misc/AccountState.h rename to src/ripple/app/misc/AccountState.h diff --git a/src/ripple/module/app/misc/AmendmentTable.h b/src/ripple/app/misc/AmendmentTable.h similarity index 99% rename from src/ripple/module/app/misc/AmendmentTable.h rename to src/ripple/app/misc/AmendmentTable.h index cc873abf09..c2b45b9386 100644 --- a/src/ripple/module/app/misc/AmendmentTable.h +++ b/src/ripple/app/misc/AmendmentTable.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_AMENDMENT_TABLE_H #define RIPPLE_AMENDMENT_TABLE_H -#include +#include namespace ripple { diff --git a/src/ripple/module/app/misc/AmendmentTableImpl.cpp b/src/ripple/app/misc/AmendmentTableImpl.cpp similarity index 100% rename from src/ripple/module/app/misc/AmendmentTableImpl.cpp rename to src/ripple/app/misc/AmendmentTableImpl.cpp diff --git a/src/ripple/module/app/misc/CanonicalTXSet.cpp b/src/ripple/app/misc/CanonicalTXSet.cpp similarity index 100% rename from src/ripple/module/app/misc/CanonicalTXSet.cpp rename to src/ripple/app/misc/CanonicalTXSet.cpp diff --git a/src/ripple/module/app/misc/CanonicalTXSet.h b/src/ripple/app/misc/CanonicalTXSet.h similarity index 100% rename from src/ripple/module/app/misc/CanonicalTXSet.h rename to src/ripple/app/misc/CanonicalTXSet.h diff --git a/src/ripple/module/app/misc/FeeVote.h b/src/ripple/app/misc/FeeVote.h similarity index 100% rename from src/ripple/module/app/misc/FeeVote.h rename to src/ripple/app/misc/FeeVote.h diff --git a/src/ripple/module/app/misc/FeeVoteImpl.cpp b/src/ripple/app/misc/FeeVoteImpl.cpp similarity index 100% rename from src/ripple/module/app/misc/FeeVoteImpl.cpp rename to src/ripple/app/misc/FeeVoteImpl.cpp diff --git a/src/ripple/module/app/misc/HashRouter.cpp b/src/ripple/app/misc/HashRouter.cpp similarity index 99% rename from src/ripple/module/app/misc/HashRouter.cpp rename to src/ripple/app/misc/HashRouter.cpp index fd3c4b513a..fcd7784aad 100644 --- a/src/ripple/module/app/misc/HashRouter.cpp +++ b/src/ripple/app/misc/HashRouter.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { // VFALCO TODO Inline the function definitions diff --git a/src/ripple/module/app/misc/IHashRouter.h b/src/ripple/app/misc/IHashRouter.h similarity index 100% rename from src/ripple/module/app/misc/IHashRouter.h rename to src/ripple/app/misc/IHashRouter.h diff --git a/src/ripple/module/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp similarity index 99% rename from src/ripple/module/app/misc/NetworkOPs.cpp rename to src/ripple/app/misc/NetworkOPs.cpp index 7a313dba4e..4a25edef78 100644 --- a/src/ripple/module/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -17,15 +17,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include +#include +#include +#include #include +#include +#include +#include #include #include #include // +#include #include namespace ripple { diff --git a/src/ripple/module/app/misc/NetworkOPs.h b/src/ripple/app/misc/NetworkOPs.h similarity index 99% rename from src/ripple/module/app/misc/NetworkOPs.h rename to src/ripple/app/misc/NetworkOPs.h index eb22d73666..3078d211d6 100644 --- a/src/ripple/module/app/misc/NetworkOPs.h +++ b/src/ripple/app/misc/NetworkOPs.h @@ -20,7 +20,9 @@ #ifndef RIPPLE_NETWORKOPS_H #define RIPPLE_NETWORKOPS_H +#include #include // +#include #include namespace ripple { diff --git a/src/ripple/module/app/misc/OrderBook.h b/src/ripple/app/misc/OrderBook.h similarity index 100% rename from src/ripple/module/app/misc/OrderBook.h rename to src/ripple/app/misc/OrderBook.h diff --git a/src/ripple/module/app/misc/PowResult.h b/src/ripple/app/misc/PowResult.h similarity index 100% rename from src/ripple/module/app/misc/PowResult.h rename to src/ripple/app/misc/PowResult.h diff --git a/src/ripple/module/app/misc/ProofOfWork.cpp b/src/ripple/app/misc/ProofOfWork.cpp similarity index 99% rename from src/ripple/module/app/misc/ProofOfWork.cpp rename to src/ripple/app/misc/ProofOfWork.cpp index 6cf9178032..dc368c362e 100644 --- a/src/ripple/module/app/misc/ProofOfWork.cpp +++ b/src/ripple/app/misc/ProofOfWork.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include diff --git a/src/ripple/module/app/misc/ProofOfWork.h b/src/ripple/app/misc/ProofOfWork.h similarity index 98% rename from src/ripple/module/app/misc/ProofOfWork.h rename to src/ripple/app/misc/ProofOfWork.h index 96db1030da..ad4a840f96 100644 --- a/src/ripple/module/app/misc/ProofOfWork.h +++ b/src/ripple/app/misc/ProofOfWork.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROOFOFWORK_H #define RIPPLE_PROOFOFWORK_H -#include +#include namespace ripple { diff --git a/src/ripple/module/app/misc/ProofOfWorkFactory.cpp b/src/ripple/app/misc/ProofOfWorkFactory.cpp similarity index 100% rename from src/ripple/module/app/misc/ProofOfWorkFactory.cpp rename to src/ripple/app/misc/ProofOfWorkFactory.cpp diff --git a/src/ripple/module/app/misc/ProofOfWorkFactory.h b/src/ripple/app/misc/ProofOfWorkFactory.h similarity index 95% rename from src/ripple/module/app/misc/ProofOfWorkFactory.h rename to src/ripple/app/misc/ProofOfWorkFactory.h index f693141b00..00dcf6472c 100644 --- a/src/ripple/module/app/misc/ProofOfWorkFactory.h +++ b/src/ripple/app/misc/ProofOfWorkFactory.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROOFOFWORKFACTORY_H_INCLUDED #define RIPPLE_PROOFOFWORKFACTORY_H_INCLUDED -#include -#include +#include +#include #include // namespace ripple { diff --git a/src/ripple/module/app/misc/README.md b/src/ripple/app/misc/README.md similarity index 100% rename from src/ripple/module/app/misc/README.md rename to src/ripple/app/misc/README.md diff --git a/src/ripple/module/app/misc/SerializedLedger.cpp b/src/ripple/app/misc/SerializedLedger.cpp similarity index 100% rename from src/ripple/module/app/misc/SerializedLedger.cpp rename to src/ripple/app/misc/SerializedLedger.cpp diff --git a/src/ripple/module/app/misc/SerializedLedger.h b/src/ripple/app/misc/SerializedLedger.h similarity index 100% rename from src/ripple/module/app/misc/SerializedLedger.h rename to src/ripple/app/misc/SerializedLedger.h diff --git a/src/ripple/module/app/misc/SerializedTransaction.cpp b/src/ripple/app/misc/SerializedTransaction.cpp similarity index 99% rename from src/ripple/module/app/misc/SerializedTransaction.cpp rename to src/ripple/app/misc/SerializedTransaction.cpp index a7b8fada01..f877317473 100644 --- a/src/ripple/module/app/misc/SerializedTransaction.cpp +++ b/src/ripple/app/misc/SerializedTransaction.cpp @@ -17,8 +17,9 @@ */ //============================================================================== -#include +#include #include +#include namespace ripple { diff --git a/src/ripple/module/app/misc/SerializedTransaction.h b/src/ripple/app/misc/SerializedTransaction.h similarity index 100% rename from src/ripple/module/app/misc/SerializedTransaction.h rename to src/ripple/app/misc/SerializedTransaction.h diff --git a/src/ripple/module/app/misc/Validations.cpp b/src/ripple/app/misc/Validations.cpp similarity index 99% rename from src/ripple/module/app/misc/Validations.cpp rename to src/ripple/app/misc/Validations.cpp index 89ca4d60a5..03b2796857 100644 --- a/src/ripple/module/app/misc/Validations.cpp +++ b/src/ripple/app/misc/Validations.cpp @@ -17,8 +17,9 @@ */ //============================================================================== -#include +#include #include // +#include namespace ripple { diff --git a/src/ripple/module/app/misc/Validations.h b/src/ripple/app/misc/Validations.h similarity index 100% rename from src/ripple/module/app/misc/Validations.h rename to src/ripple/app/misc/Validations.h diff --git a/src/ripple/module/app/node/SqliteFactory.cpp b/src/ripple/app/node/SqliteFactory.cpp similarity index 98% rename from src/ripple/module/app/node/SqliteFactory.cpp rename to src/ripple/app/node/SqliteFactory.cpp index 3be96cab07..bd97c91fb3 100644 --- a/src/ripple/module/app/node/SqliteFactory.cpp +++ b/src/ripple/app/node/SqliteFactory.cpp @@ -17,7 +17,8 @@ */ //============================================================================== -#include +#include +#include namespace ripple { diff --git a/src/ripple/module/app/node/SqliteFactory.h b/src/ripple/app/node/SqliteFactory.h similarity index 100% rename from src/ripple/module/app/node/SqliteFactory.h rename to src/ripple/app/node/SqliteFactory.h diff --git a/src/ripple/module/app/paths/Node.cpp b/src/ripple/app/paths/Node.cpp similarity index 100% rename from src/ripple/module/app/paths/Node.cpp rename to src/ripple/app/paths/Node.cpp diff --git a/src/ripple/module/app/paths/Node.h b/src/ripple/app/paths/Node.h similarity index 96% rename from src/ripple/module/app/paths/Node.h rename to src/ripple/app/paths/Node.h index 883be1069e..22b139b8ee 100644 --- a/src/ripple/module/app/paths/Node.h +++ b/src/ripple/app/paths/Node.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_PATH_NODE_H #define RIPPLE_APP_PATH_NODE_H -#include -#include -#include +#include +#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/paths/NodeDirectory.h b/src/ripple/app/paths/NodeDirectory.h similarity index 100% rename from src/ripple/module/app/paths/NodeDirectory.h rename to src/ripple/app/paths/NodeDirectory.h diff --git a/src/ripple/module/app/paths/PathRequest.cpp b/src/ripple/app/paths/PathRequest.cpp similarity index 99% rename from src/ripple/module/app/paths/PathRequest.cpp rename to src/ripple/app/paths/PathRequest.cpp index 015db503a1..8e16867238 100644 --- a/src/ripple/module/app/paths/PathRequest.cpp +++ b/src/ripple/app/paths/PathRequest.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/module/app/paths/PathRequest.h b/src/ripple/app/paths/PathRequest.h similarity index 100% rename from src/ripple/module/app/paths/PathRequest.h rename to src/ripple/app/paths/PathRequest.h diff --git a/src/ripple/module/app/paths/PathRequests.cpp b/src/ripple/app/paths/PathRequests.cpp similarity index 99% rename from src/ripple/module/app/paths/PathRequests.cpp rename to src/ripple/app/paths/PathRequests.cpp index bb93fd501c..7505c890ff 100644 --- a/src/ripple/module/app/paths/PathRequests.cpp +++ b/src/ripple/app/paths/PathRequests.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { /** Get the current RippleLineCache, updating it if necessary. @@ -69,7 +71,6 @@ void PathRequests::updateAll (Ledger::ref inLedger, do { - BOOST_FOREACH (PathRequest::wref wRequest, requests) { if (shouldCancel()) diff --git a/src/ripple/module/app/paths/PathRequests.h b/src/ripple/app/paths/PathRequests.h similarity index 100% rename from src/ripple/module/app/paths/PathRequests.h rename to src/ripple/app/paths/PathRequests.h diff --git a/src/ripple/module/app/paths/PathState.cpp b/src/ripple/app/paths/PathState.cpp similarity index 100% rename from src/ripple/module/app/paths/PathState.cpp rename to src/ripple/app/paths/PathState.cpp diff --git a/src/ripple/module/app/paths/PathState.h b/src/ripple/app/paths/PathState.h similarity index 98% rename from src/ripple/module/app/paths/PathState.h rename to src/ripple/app/paths/PathState.h index be1cca6403..a03d26febd 100644 --- a/src/ripple/module/app/paths/PathState.h +++ b/src/ripple/app/paths/PathState.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PATHSTATE_H #define RIPPLE_PATHSTATE_H -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/module/app/paths/Pathfinder.cpp b/src/ripple/app/paths/Pathfinder.cpp similarity index 99% rename from src/ripple/module/app/paths/Pathfinder.cpp rename to src/ripple/app/paths/Pathfinder.cpp index 54ef722d85..4acf518531 100644 --- a/src/ripple/module/app/paths/Pathfinder.cpp +++ b/src/ripple/app/paths/Pathfinder.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include diff --git a/src/ripple/module/app/paths/Pathfinder.h b/src/ripple/app/paths/Pathfinder.h similarity index 100% rename from src/ripple/module/app/paths/Pathfinder.h rename to src/ripple/app/paths/Pathfinder.h diff --git a/src/ripple/module/app/paths/README.md b/src/ripple/app/paths/README.md similarity index 100% rename from src/ripple/module/app/paths/README.md rename to src/ripple/app/paths/README.md diff --git a/src/ripple/module/app/paths/RippleCalc.cpp b/src/ripple/app/paths/RippleCalc.cpp similarity index 99% rename from src/ripple/module/app/paths/RippleCalc.cpp rename to src/ripple/app/paths/RippleCalc.cpp index d947cdb7b2..ba39d51292 100644 --- a/src/ripple/module/app/paths/RippleCalc.cpp +++ b/src/ripple/app/paths/RippleCalc.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/paths/RippleCalc.h b/src/ripple/app/paths/RippleCalc.h similarity index 100% rename from src/ripple/module/app/paths/RippleCalc.h rename to src/ripple/app/paths/RippleCalc.h diff --git a/src/ripple/module/app/paths/RippleLineCache.cpp b/src/ripple/app/paths/RippleLineCache.cpp similarity index 100% rename from src/ripple/module/app/paths/RippleLineCache.cpp rename to src/ripple/app/paths/RippleLineCache.cpp diff --git a/src/ripple/module/app/paths/RippleLineCache.h b/src/ripple/app/paths/RippleLineCache.h similarity index 100% rename from src/ripple/module/app/paths/RippleLineCache.h rename to src/ripple/app/paths/RippleLineCache.h diff --git a/src/ripple/module/app/paths/RippleState.cpp b/src/ripple/app/paths/RippleState.cpp similarity index 100% rename from src/ripple/module/app/paths/RippleState.cpp rename to src/ripple/app/paths/RippleState.cpp diff --git a/src/ripple/module/app/paths/RippleState.h b/src/ripple/app/paths/RippleState.h similarity index 100% rename from src/ripple/module/app/paths/RippleState.h rename to src/ripple/app/paths/RippleState.h diff --git a/src/ripple/module/app/paths/Tuning.h b/src/ripple/app/paths/Tuning.h similarity index 100% rename from src/ripple/module/app/paths/Tuning.h rename to src/ripple/app/paths/Tuning.h diff --git a/src/ripple/module/app/paths/Types.h b/src/ripple/app/paths/Types.h similarity index 100% rename from src/ripple/module/app/paths/Types.h rename to src/ripple/app/paths/Types.h diff --git a/src/ripple/module/app/paths/cursor/AdvanceNode.cpp b/src/ripple/app/paths/cursor/AdvanceNode.cpp similarity index 99% rename from src/ripple/module/app/paths/cursor/AdvanceNode.cpp rename to src/ripple/app/paths/cursor/AdvanceNode.cpp index 6a946073f3..bb19b1e645 100644 --- a/src/ripple/module/app/paths/cursor/AdvanceNode.cpp +++ b/src/ripple/app/paths/cursor/AdvanceNode.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/paths/cursor/DeliverNodeForward.cpp b/src/ripple/app/paths/cursor/DeliverNodeForward.cpp similarity index 99% rename from src/ripple/module/app/paths/cursor/DeliverNodeForward.cpp rename to src/ripple/app/paths/cursor/DeliverNodeForward.cpp index e9f70a78b9..b3f125c04e 100644 --- a/src/ripple/module/app/paths/cursor/DeliverNodeForward.cpp +++ b/src/ripple/app/paths/cursor/DeliverNodeForward.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/paths/cursor/DeliverNodeReverse.cpp b/src/ripple/app/paths/cursor/DeliverNodeReverse.cpp similarity index 99% rename from src/ripple/module/app/paths/cursor/DeliverNodeReverse.cpp rename to src/ripple/app/paths/cursor/DeliverNodeReverse.cpp index c494445f83..326ebeb85c 100644 --- a/src/ripple/module/app/paths/cursor/DeliverNodeReverse.cpp +++ b/src/ripple/app/paths/cursor/DeliverNodeReverse.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/paths/cursor/ForwardLiquidity.cpp b/src/ripple/app/paths/cursor/ForwardLiquidity.cpp similarity index 100% rename from src/ripple/module/app/paths/cursor/ForwardLiquidity.cpp rename to src/ripple/app/paths/cursor/ForwardLiquidity.cpp diff --git a/src/ripple/module/app/paths/cursor/ForwardLiquidityForAccount.cpp b/src/ripple/app/paths/cursor/ForwardLiquidityForAccount.cpp similarity index 99% rename from src/ripple/module/app/paths/cursor/ForwardLiquidityForAccount.cpp rename to src/ripple/app/paths/cursor/ForwardLiquidityForAccount.cpp index 3bc3bd9230..e40534816c 100644 --- a/src/ripple/module/app/paths/cursor/ForwardLiquidityForAccount.cpp +++ b/src/ripple/app/paths/cursor/ForwardLiquidityForAccount.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/paths/cursor/Liquidity.cpp b/src/ripple/app/paths/cursor/Liquidity.cpp similarity index 97% rename from src/ripple/module/app/paths/cursor/Liquidity.cpp rename to src/ripple/app/paths/cursor/Liquidity.cpp index 2ca8fba1e3..4abfefbd85 100644 --- a/src/ripple/module/app/paths/cursor/Liquidity.cpp +++ b/src/ripple/app/paths/cursor/Liquidity.cpp @@ -19,7 +19,7 @@ #include -#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/paths/cursor/NextIncrement.cpp b/src/ripple/app/paths/cursor/NextIncrement.cpp similarity index 97% rename from src/ripple/module/app/paths/cursor/NextIncrement.cpp rename to src/ripple/app/paths/cursor/NextIncrement.cpp index 9808a442a4..e5272979c5 100644 --- a/src/ripple/module/app/paths/cursor/NextIncrement.cpp +++ b/src/ripple/app/paths/cursor/NextIncrement.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/paths/cursor/PathCursor.h b/src/ripple/app/paths/cursor/PathCursor.h similarity index 100% rename from src/ripple/module/app/paths/cursor/PathCursor.h rename to src/ripple/app/paths/cursor/PathCursor.h diff --git a/src/ripple/module/app/paths/cursor/ReverseLiquidity.cpp b/src/ripple/app/paths/cursor/ReverseLiquidity.cpp similarity index 100% rename from src/ripple/module/app/paths/cursor/ReverseLiquidity.cpp rename to src/ripple/app/paths/cursor/ReverseLiquidity.cpp diff --git a/src/ripple/module/app/paths/cursor/ReverseLiquidityForAccount.cpp b/src/ripple/app/paths/cursor/ReverseLiquidityForAccount.cpp similarity index 99% rename from src/ripple/module/app/paths/cursor/ReverseLiquidityForAccount.cpp rename to src/ripple/app/paths/cursor/ReverseLiquidityForAccount.cpp index feaee4687a..7d5aff7a1e 100644 --- a/src/ripple/module/app/paths/cursor/ReverseLiquidityForAccount.cpp +++ b/src/ripple/app/paths/cursor/ReverseLiquidityForAccount.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/paths/cursor/RippleLiquidity.cpp b/src/ripple/app/paths/cursor/RippleLiquidity.cpp similarity index 99% rename from src/ripple/module/app/paths/cursor/RippleLiquidity.cpp rename to src/ripple/app/paths/cursor/RippleLiquidity.cpp index 611042046c..6089d55296 100644 --- a/src/ripple/module/app/paths/cursor/RippleLiquidity.cpp +++ b/src/ripple/app/paths/cursor/RippleLiquidity.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/paths/cursor/RippleLiquidity.h b/src/ripple/app/paths/cursor/RippleLiquidity.h similarity index 92% rename from src/ripple/module/app/paths/cursor/RippleLiquidity.h rename to src/ripple/app/paths/cursor/RippleLiquidity.h index cca77dad90..3ff6c75a16 100644 --- a/src/ripple/module/app/paths/cursor/RippleLiquidity.h +++ b/src/ripple/app/paths/cursor/RippleLiquidity.h @@ -22,9 +22,9 @@ #include -#include -#include -#include +#include +#include +#include namespace ripple { namespace path { diff --git a/src/ripple/module/app/peers/ClusterNodeStatus.h b/src/ripple/app/peers/ClusterNodeStatus.h similarity index 100% rename from src/ripple/module/app/peers/ClusterNodeStatus.h rename to src/ripple/app/peers/ClusterNodeStatus.h diff --git a/src/ripple/module/app/peers/PeerSet.cpp b/src/ripple/app/peers/PeerSet.cpp similarity index 100% rename from src/ripple/module/app/peers/PeerSet.cpp rename to src/ripple/app/peers/PeerSet.cpp diff --git a/src/ripple/module/app/peers/PeerSet.h b/src/ripple/app/peers/PeerSet.h similarity index 99% rename from src/ripple/module/app/peers/PeerSet.h rename to src/ripple/app/peers/PeerSet.h index e6425de762..1721b5e067 100644 --- a/src/ripple/module/app/peers/PeerSet.h +++ b/src/ripple/app/peers/PeerSet.h @@ -21,6 +21,7 @@ #define RIPPLE_PEERSET_H #include +#include namespace ripple { diff --git a/src/ripple/module/app/peers/TODO.md b/src/ripple/app/peers/TODO.md similarity index 100% rename from src/ripple/module/app/peers/TODO.md rename to src/ripple/app/peers/TODO.md diff --git a/src/ripple/module/app/peers/UniqueNodeList.cpp b/src/ripple/app/peers/UniqueNodeList.cpp similarity index 99% rename from src/ripple/module/app/peers/UniqueNodeList.cpp rename to src/ripple/app/peers/UniqueNodeList.cpp index 1eff80f40f..722b5a9ab2 100644 --- a/src/ripple/module/app/peers/UniqueNodeList.cpp +++ b/src/ripple/app/peers/UniqueNodeList.cpp @@ -17,13 +17,16 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include -#include -#include #include // +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/app/peers/UniqueNodeList.h b/src/ripple/app/peers/UniqueNodeList.h similarity index 97% rename from src/ripple/module/app/peers/UniqueNodeList.h rename to src/ripple/app/peers/UniqueNodeList.h index c6a31ee97a..545ad9150d 100644 --- a/src/ripple/module/app/peers/UniqueNodeList.h +++ b/src/ripple/app/peers/UniqueNodeList.h @@ -21,6 +21,8 @@ #define RIPPLE_UNIQUENODELIST_H_INCLUDED #include // +#include +#include namespace ripple { diff --git a/src/ripple/module/app/shamap/FetchPackTests.cpp b/src/ripple/app/shamap/FetchPackTests.cpp similarity index 100% rename from src/ripple/module/app/shamap/FetchPackTests.cpp rename to src/ripple/app/shamap/FetchPackTests.cpp diff --git a/src/ripple/module/app/shamap/README.md b/src/ripple/app/shamap/README.md similarity index 100% rename from src/ripple/module/app/shamap/README.md rename to src/ripple/app/shamap/README.md diff --git a/src/ripple/module/app/shamap/RadixMapTest.cpp b/src/ripple/app/shamap/RadixMapTest.cpp similarity index 100% rename from src/ripple/module/app/shamap/RadixMapTest.cpp rename to src/ripple/app/shamap/RadixMapTest.cpp diff --git a/src/ripple/module/app/shamap/RadixMapTest.h b/src/ripple/app/shamap/RadixMapTest.h similarity index 100% rename from src/ripple/module/app/shamap/RadixMapTest.h rename to src/ripple/app/shamap/RadixMapTest.h diff --git a/src/ripple/module/app/shamap/SHAMap.cpp b/src/ripple/app/shamap/SHAMap.cpp similarity index 100% rename from src/ripple/module/app/shamap/SHAMap.cpp rename to src/ripple/app/shamap/SHAMap.cpp diff --git a/src/ripple/module/app/shamap/SHAMap.h b/src/ripple/app/shamap/SHAMap.h similarity index 99% rename from src/ripple/module/app/shamap/SHAMap.h rename to src/ripple/app/shamap/SHAMap.h index 34015ee0de..5736548a05 100644 --- a/src/ripple/module/app/shamap/SHAMap.h +++ b/src/ripple/app/shamap/SHAMap.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_SHAMAP_H #define RIPPLE_SHAMAP_H +#include #include -#include +#include #include -#include #include #include #include diff --git a/src/ripple/module/app/shamap/SHAMapAddNode.h b/src/ripple/app/shamap/SHAMapAddNode.h similarity index 100% rename from src/ripple/module/app/shamap/SHAMapAddNode.h rename to src/ripple/app/shamap/SHAMapAddNode.h diff --git a/src/ripple/module/app/shamap/SHAMapDelta.cpp b/src/ripple/app/shamap/SHAMapDelta.cpp similarity index 100% rename from src/ripple/module/app/shamap/SHAMapDelta.cpp rename to src/ripple/app/shamap/SHAMapDelta.cpp diff --git a/src/ripple/module/app/shamap/SHAMapItem.cpp b/src/ripple/app/shamap/SHAMapItem.cpp similarity index 100% rename from src/ripple/module/app/shamap/SHAMapItem.cpp rename to src/ripple/app/shamap/SHAMapItem.cpp diff --git a/src/ripple/module/app/shamap/SHAMapItem.h b/src/ripple/app/shamap/SHAMapItem.h similarity index 98% rename from src/ripple/module/app/shamap/SHAMapItem.h rename to src/ripple/app/shamap/SHAMapItem.h index a9f392feac..05b5c462c5 100644 --- a/src/ripple/module/app/shamap/SHAMapItem.h +++ b/src/ripple/app/shamap/SHAMapItem.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_SHAMAPITEM_H #define RIPPLE_SHAMAPITEM_H +#include + namespace ripple { // an item stored in a SHAMap diff --git a/src/ripple/module/app/shamap/SHAMapMissingNode.cpp b/src/ripple/app/shamap/SHAMapMissingNode.cpp similarity index 100% rename from src/ripple/module/app/shamap/SHAMapMissingNode.cpp rename to src/ripple/app/shamap/SHAMapMissingNode.cpp diff --git a/src/ripple/module/app/shamap/SHAMapMissingNode.h b/src/ripple/app/shamap/SHAMapMissingNode.h similarity index 100% rename from src/ripple/module/app/shamap/SHAMapMissingNode.h rename to src/ripple/app/shamap/SHAMapMissingNode.h diff --git a/src/ripple/module/app/shamap/SHAMapNodeID.cpp b/src/ripple/app/shamap/SHAMapNodeID.cpp similarity index 98% rename from src/ripple/module/app/shamap/SHAMapNodeID.cpp rename to src/ripple/app/shamap/SHAMapNodeID.cpp index 36b13ce03e..58d2ea0993 100644 --- a/src/ripple/module/app/shamap/SHAMapNodeID.cpp +++ b/src/ripple/app/shamap/SHAMapNodeID.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ripple/module/app/shamap/SHAMapNodeID.h b/src/ripple/app/shamap/SHAMapNodeID.h similarity index 99% rename from src/ripple/module/app/shamap/SHAMapNodeID.h rename to src/ripple/app/shamap/SHAMapNodeID.h index 58a075b45b..e07541a8f6 100644 --- a/src/ripple/module/app/shamap/SHAMapNodeID.h +++ b/src/ripple/app/shamap/SHAMapNodeID.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SHAMAPNODEID_H #define RIPPLE_SHAMAPNODEID_H -#include +#include #include #include #include diff --git a/src/ripple/module/app/shamap/SHAMapSync.cpp b/src/ripple/app/shamap/SHAMapSync.cpp similarity index 100% rename from src/ripple/module/app/shamap/SHAMapSync.cpp rename to src/ripple/app/shamap/SHAMapSync.cpp diff --git a/src/ripple/module/app/shamap/SHAMapSyncFilter.h b/src/ripple/app/shamap/SHAMapSyncFilter.h similarity index 100% rename from src/ripple/module/app/shamap/SHAMapSyncFilter.h rename to src/ripple/app/shamap/SHAMapSyncFilter.h diff --git a/src/ripple/module/app/shamap/SHAMapSyncFilters.cpp b/src/ripple/app/shamap/SHAMapSyncFilters.cpp similarity index 100% rename from src/ripple/module/app/shamap/SHAMapSyncFilters.cpp rename to src/ripple/app/shamap/SHAMapSyncFilters.cpp diff --git a/src/ripple/module/app/shamap/SHAMapSyncFilters.h b/src/ripple/app/shamap/SHAMapSyncFilters.h similarity index 100% rename from src/ripple/module/app/shamap/SHAMapSyncFilters.h rename to src/ripple/app/shamap/SHAMapSyncFilters.h diff --git a/src/ripple/module/app/shamap/SHAMapTreeNode.cpp b/src/ripple/app/shamap/SHAMapTreeNode.cpp similarity index 99% rename from src/ripple/module/app/shamap/SHAMapTreeNode.cpp rename to src/ripple/app/shamap/SHAMapTreeNode.cpp index 453f117bbc..01da8fe25b 100644 --- a/src/ripple/module/app/shamap/SHAMapTreeNode.cpp +++ b/src/ripple/app/shamap/SHAMapTreeNode.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { SHAMapTreeNode::SHAMapTreeNode (std::uint32_t seq) diff --git a/src/ripple/module/app/shamap/SHAMapTreeNode.h b/src/ripple/app/shamap/SHAMapTreeNode.h similarity index 98% rename from src/ripple/module/app/shamap/SHAMapTreeNode.h rename to src/ripple/app/shamap/SHAMapTreeNode.h index cefff3915b..b3080dc5c7 100644 --- a/src/ripple/module/app/shamap/SHAMapTreeNode.h +++ b/src/ripple/app/shamap/SHAMapTreeNode.h @@ -20,7 +20,8 @@ #ifndef RIPPLE_SHAMAPTREENODE_H #define RIPPLE_SHAMAPTREENODE_H -#include +#include +#include namespace ripple { diff --git a/src/ripple/module/app/transactors/AddWallet.cpp b/src/ripple/app/transactors/AddWallet.cpp similarity index 100% rename from src/ripple/module/app/transactors/AddWallet.cpp rename to src/ripple/app/transactors/AddWallet.cpp diff --git a/src/ripple/module/app/transactors/CancelOffer.cpp b/src/ripple/app/transactors/CancelOffer.cpp similarity index 100% rename from src/ripple/module/app/transactors/CancelOffer.cpp rename to src/ripple/app/transactors/CancelOffer.cpp diff --git a/src/ripple/module/app/transactors/CancelTicket.cpp b/src/ripple/app/transactors/CancelTicket.cpp similarity index 100% rename from src/ripple/module/app/transactors/CancelTicket.cpp rename to src/ripple/app/transactors/CancelTicket.cpp diff --git a/src/ripple/module/app/transactors/CancelTicket.h b/src/ripple/app/transactors/CancelTicket.h similarity index 100% rename from src/ripple/module/app/transactors/CancelTicket.h rename to src/ripple/app/transactors/CancelTicket.h diff --git a/src/ripple/module/app/transactors/Change.cpp b/src/ripple/app/transactors/Change.cpp similarity index 100% rename from src/ripple/module/app/transactors/Change.cpp rename to src/ripple/app/transactors/Change.cpp diff --git a/src/ripple/module/app/transactors/CreateOffer.cpp b/src/ripple/app/transactors/CreateOffer.cpp similarity index 99% rename from src/ripple/module/app/transactors/CreateOffer.cpp rename to src/ripple/app/transactors/CreateOffer.cpp index e735b34252..ad586ce8a5 100644 --- a/src/ripple/module/app/transactors/CreateOffer.cpp +++ b/src/ripple/app/transactors/CreateOffer.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/ripple/module/app/transactors/CreateOfferBridged.cpp b/src/ripple/app/transactors/CreateOfferBridged.cpp similarity index 98% rename from src/ripple/module/app/transactors/CreateOfferBridged.cpp rename to src/ripple/app/transactors/CreateOfferBridged.cpp index 34e3dfe464..62c786a61b 100644 --- a/src/ripple/module/app/transactors/CreateOfferBridged.cpp +++ b/src/ripple/app/transactors/CreateOfferBridged.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/module/app/transactors/CreateOfferDirect.cpp b/src/ripple/app/transactors/CreateOfferDirect.cpp similarity index 97% rename from src/ripple/module/app/transactors/CreateOfferDirect.cpp rename to src/ripple/app/transactors/CreateOfferDirect.cpp index 115b61c760..f1eda6bb65 100644 --- a/src/ripple/module/app/transactors/CreateOfferDirect.cpp +++ b/src/ripple/app/transactors/CreateOfferDirect.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/module/app/transactors/CreateTicket.cpp b/src/ripple/app/transactors/CreateTicket.cpp similarity index 100% rename from src/ripple/module/app/transactors/CreateTicket.cpp rename to src/ripple/app/transactors/CreateTicket.cpp diff --git a/src/ripple/module/app/transactors/CreateTicket.h b/src/ripple/app/transactors/CreateTicket.h similarity index 100% rename from src/ripple/module/app/transactors/CreateTicket.h rename to src/ripple/app/transactors/CreateTicket.h diff --git a/src/ripple/module/app/transactors/Payment.cpp b/src/ripple/app/transactors/Payment.cpp similarity index 100% rename from src/ripple/module/app/transactors/Payment.cpp rename to src/ripple/app/transactors/Payment.cpp diff --git a/src/ripple/module/app/transactors/SetAccount.cpp b/src/ripple/app/transactors/SetAccount.cpp similarity index 99% rename from src/ripple/module/app/transactors/SetAccount.cpp rename to src/ripple/app/transactors/SetAccount.cpp index 7ce1bbccfe..2a79dc345c 100644 --- a/src/ripple/module/app/transactors/SetAccount.cpp +++ b/src/ripple/app/transactors/SetAccount.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/app/transactors/SetRegularKey.cpp b/src/ripple/app/transactors/SetRegularKey.cpp similarity index 100% rename from src/ripple/module/app/transactors/SetRegularKey.cpp rename to src/ripple/app/transactors/SetRegularKey.cpp diff --git a/src/ripple/module/app/transactors/SetTrust.cpp b/src/ripple/app/transactors/SetTrust.cpp similarity index 100% rename from src/ripple/module/app/transactors/SetTrust.cpp rename to src/ripple/app/transactors/SetTrust.cpp diff --git a/src/ripple/module/app/transactors/Transactor.cpp b/src/ripple/app/transactors/Transactor.cpp similarity index 99% rename from src/ripple/module/app/transactors/Transactor.cpp rename to src/ripple/app/transactors/Transactor.cpp index a126fced33..db72df1502 100644 --- a/src/ripple/module/app/transactors/Transactor.cpp +++ b/src/ripple/app/transactors/Transactor.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/module/app/transactors/Transactor.h b/src/ripple/app/transactors/Transactor.h similarity index 100% rename from src/ripple/module/app/transactors/Transactor.h rename to src/ripple/app/transactors/Transactor.h diff --git a/src/ripple/module/app/tx/LocalTxs.cpp b/src/ripple/app/tx/LocalTxs.cpp similarity index 100% rename from src/ripple/module/app/tx/LocalTxs.cpp rename to src/ripple/app/tx/LocalTxs.cpp diff --git a/src/ripple/module/app/tx/LocalTxs.h b/src/ripple/app/tx/LocalTxs.h similarity index 100% rename from src/ripple/module/app/tx/LocalTxs.h rename to src/ripple/app/tx/LocalTxs.h diff --git a/src/ripple/module/app/tx/Transaction.cpp b/src/ripple/app/tx/Transaction.cpp similarity index 100% rename from src/ripple/module/app/tx/Transaction.cpp rename to src/ripple/app/tx/Transaction.cpp diff --git a/src/ripple/module/app/tx/Transaction.h b/src/ripple/app/tx/Transaction.h similarity index 100% rename from src/ripple/module/app/tx/Transaction.h rename to src/ripple/app/tx/Transaction.h diff --git a/src/ripple/module/app/tx/TransactionAcquire.cpp b/src/ripple/app/tx/TransactionAcquire.cpp similarity index 99% rename from src/ripple/module/app/tx/TransactionAcquire.cpp rename to src/ripple/app/tx/TransactionAcquire.cpp index e0aab582d9..f7fa5b32ab 100644 --- a/src/ripple/module/app/tx/TransactionAcquire.cpp +++ b/src/ripple/app/tx/TransactionAcquire.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include namespace ripple { diff --git a/src/ripple/module/app/tx/TransactionAcquire.h b/src/ripple/app/tx/TransactionAcquire.h similarity index 100% rename from src/ripple/module/app/tx/TransactionAcquire.h rename to src/ripple/app/tx/TransactionAcquire.h diff --git a/src/ripple/module/app/tx/TransactionCheck.cpp b/src/ripple/app/tx/TransactionCheck.cpp similarity index 100% rename from src/ripple/module/app/tx/TransactionCheck.cpp rename to src/ripple/app/tx/TransactionCheck.cpp diff --git a/src/ripple/module/app/tx/TransactionEngine.cpp b/src/ripple/app/tx/TransactionEngine.cpp similarity index 100% rename from src/ripple/module/app/tx/TransactionEngine.cpp rename to src/ripple/app/tx/TransactionEngine.cpp diff --git a/src/ripple/module/app/tx/TransactionEngine.h b/src/ripple/app/tx/TransactionEngine.h similarity index 100% rename from src/ripple/module/app/tx/TransactionEngine.h rename to src/ripple/app/tx/TransactionEngine.h diff --git a/src/ripple/module/app/tx/TransactionMaster.cpp b/src/ripple/app/tx/TransactionMaster.cpp similarity index 100% rename from src/ripple/module/app/tx/TransactionMaster.cpp rename to src/ripple/app/tx/TransactionMaster.cpp diff --git a/src/ripple/module/app/tx/TransactionMaster.h b/src/ripple/app/tx/TransactionMaster.h similarity index 100% rename from src/ripple/module/app/tx/TransactionMaster.h rename to src/ripple/app/tx/TransactionMaster.h diff --git a/src/ripple/module/app/tx/TransactionMeta.cpp b/src/ripple/app/tx/TransactionMeta.cpp similarity index 100% rename from src/ripple/module/app/tx/TransactionMeta.cpp rename to src/ripple/app/tx/TransactionMeta.cpp diff --git a/src/ripple/module/app/tx/TransactionMeta.h b/src/ripple/app/tx/TransactionMeta.h similarity index 99% rename from src/ripple/module/app/tx/TransactionMeta.h rename to src/ripple/app/tx/TransactionMeta.h index c5cfc5da92..7e35f41db4 100644 --- a/src/ripple/module/app/tx/TransactionMeta.h +++ b/src/ripple/app/tx/TransactionMeta.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_TRANSACTIONMETA_H #define RIPPLE_TRANSACTIONMETA_H +#include + namespace ripple { class TransactionMetaSet : beast::LeakChecked diff --git a/src/ripple/module/app/tx/TxQueue.cpp b/src/ripple/app/tx/TxQueue.cpp similarity index 99% rename from src/ripple/module/app/tx/TxQueue.cpp rename to src/ripple/app/tx/TxQueue.cpp index d36f806508..3cd0a6e910 100644 --- a/src/ripple/module/app/tx/TxQueue.cpp +++ b/src/ripple/app/tx/TxQueue.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/module/app/tx/TxQueue.h b/src/ripple/app/tx/TxQueue.h similarity index 100% rename from src/ripple/module/app/tx/TxQueue.h rename to src/ripple/app/tx/TxQueue.h diff --git a/src/ripple/module/app/tx/TxQueueEntry.cpp b/src/ripple/app/tx/TxQueueEntry.cpp similarity index 97% rename from src/ripple/module/app/tx/TxQueueEntry.cpp rename to src/ripple/app/tx/TxQueueEntry.cpp index 40a19eb9da..0bd2a22f06 100644 --- a/src/ripple/module/app/tx/TxQueueEntry.cpp +++ b/src/ripple/app/tx/TxQueueEntry.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { void TxQueueEntry::addCallbacks (const TxQueueEntry& otherEntry) diff --git a/src/ripple/module/app/tx/TxQueueEntry.h b/src/ripple/app/tx/TxQueueEntry.h similarity index 100% rename from src/ripple/module/app/tx/TxQueueEntry.h rename to src/ripple/app/tx/TxQueueEntry.h diff --git a/src/ripple/module/app/websocket/WSConnection.cpp b/src/ripple/app/websocket/WSConnection.cpp similarity index 100% rename from src/ripple/module/app/websocket/WSConnection.cpp rename to src/ripple/app/websocket/WSConnection.cpp diff --git a/src/ripple/module/app/websocket/WSConnection.h b/src/ripple/app/websocket/WSConnection.h similarity index 100% rename from src/ripple/module/app/websocket/WSConnection.h rename to src/ripple/app/websocket/WSConnection.h diff --git a/src/ripple/module/app/websocket/WSDoor.cpp b/src/ripple/app/websocket/WSDoor.cpp similarity index 99% rename from src/ripple/module/app/websocket/WSDoor.cpp rename to src/ripple/app/websocket/WSDoor.cpp index 5f989c0141..36a89dacc6 100644 --- a/src/ripple/module/app/websocket/WSDoor.cpp +++ b/src/ripple/app/websocket/WSDoor.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include // namespace ripple { diff --git a/src/ripple/module/app/websocket/WSDoor.h b/src/ripple/app/websocket/WSDoor.h similarity index 100% rename from src/ripple/module/app/websocket/WSDoor.h rename to src/ripple/app/websocket/WSDoor.h diff --git a/src/ripple/module/app/websocket/WSServerHandler.cpp b/src/ripple/app/websocket/WSServerHandler.cpp similarity index 94% rename from src/ripple/module/app/websocket/WSServerHandler.cpp rename to src/ripple/app/websocket/WSServerHandler.cpp index e27dda6ee1..65ff6988ea 100644 --- a/src/ripple/module/app/websocket/WSServerHandler.cpp +++ b/src/ripple/app/websocket/WSServerHandler.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/app/websocket/WSServerHandler.h b/src/ripple/app/websocket/WSServerHandler.h similarity index 99% rename from src/ripple/module/app/websocket/WSServerHandler.h rename to src/ripple/app/websocket/WSServerHandler.h index 9ec2dd6d93..b6eebc26bd 100644 --- a/src/ripple/module/app/websocket/WSServerHandler.h +++ b/src/ripple/app/websocket/WSServerHandler.h @@ -21,7 +21,7 @@ #define RIPPLE_WSSERVERHANDLER_H_INCLUDED #include -#include +#include namespace ripple { diff --git a/src/ripple/unity/radmap.h b/src/ripple/basics/ArraySize.h similarity index 85% rename from src/ripple/unity/radmap.h rename to src/ripple/basics/ArraySize.h index 98cb397e5c..a600f8913c 100644 --- a/src/ripple/unity/radmap.h +++ b/src/ripple/basics/ArraySize.h @@ -17,10 +17,14 @@ */ //============================================================================== -#ifndef RIPPLE_RADMAP_H_INCLUDED -#define RIPPLE_RADMAP_H_INCLUDED +#ifndef RIPPLE_ARRAYSIZE_H_INCLUDED +#define RIPPLE_ARRAYSIZE_H_INCLUDED -#include -#include +namespace ripple { + +// DEPRECATED +#define RIPPLE_ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0])) + +} // ripple #endif diff --git a/src/ripple/basics/types/BasicTypes.h b/src/ripple/basics/BasicTypes.h similarity index 100% rename from src/ripple/basics/types/BasicTypes.h rename to src/ripple/basics/BasicTypes.h diff --git a/src/ripple/basics/system/BoostIncludes.h b/src/ripple/basics/BoostIncludes.h similarity index 100% rename from src/ripple/basics/system/BoostIncludes.h rename to src/ripple/basics/BoostIncludes.h diff --git a/src/ripple/basics/system/CheckLibraryVersions.h b/src/ripple/basics/CheckLibraryVersions.h similarity index 100% rename from src/ripple/basics/system/CheckLibraryVersions.h rename to src/ripple/basics/CheckLibraryVersions.h diff --git a/src/ripple/basics/utility/CountedObject.h b/src/ripple/basics/CountedObject.h similarity index 100% rename from src/ripple/basics/utility/CountedObject.h rename to src/ripple/basics/CountedObject.h diff --git a/src/ripple/basics/log/Log.h b/src/ripple/basics/Log.h similarity index 100% rename from src/ripple/basics/log/Log.h rename to src/ripple/basics/Log.h diff --git a/src/ripple/basics/log/LoggedTimings.h b/src/ripple/basics/LoggedTimings.h similarity index 98% rename from src/ripple/basics/log/LoggedTimings.h rename to src/ripple/basics/LoggedTimings.h index 932bb251d8..cbb601bf75 100644 --- a/src/ripple/basics/log/LoggedTimings.h +++ b/src/ripple/basics/LoggedTimings.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace ripple { diff --git a/src/ripple/basics/containers/RangeSet.h b/src/ripple/basics/RangeSet.h similarity index 100% rename from src/ripple/basics/containers/RangeSet.h rename to src/ripple/basics/RangeSet.h diff --git a/src/ripple/basics/utility/StringUtilities.h b/src/ripple/basics/StringUtilities.h similarity index 97% rename from src/ripple/basics/utility/StringUtilities.h rename to src/ripple/basics/StringUtilities.h index 8f333e0e51..b6abff4677 100644 --- a/src/ripple/basics/utility/StringUtilities.h +++ b/src/ripple/basics/StringUtilities.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_STRINGUTILITIES_H #define RIPPLE_STRINGUTILITIES_H -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ripple/basics/utility/Sustain.h b/src/ripple/basics/Sustain.h similarity index 100% rename from src/ripple/basics/utility/Sustain.h rename to src/ripple/basics/Sustain.h diff --git a/src/ripple/basics/containers/SyncUnorderedMap.h b/src/ripple/basics/SyncUnorderedMap.h similarity index 98% rename from src/ripple/basics/containers/SyncUnorderedMap.h rename to src/ripple/basics/SyncUnorderedMap.h index 06f286f64f..089a871cc7 100644 --- a/src/ripple/basics/containers/SyncUnorderedMap.h +++ b/src/ripple/basics/SyncUnorderedMap.h @@ -21,6 +21,7 @@ #define RIPPLE_SYNC_UNORDERED_MAP_H #include +#include namespace ripple { @@ -28,7 +29,7 @@ namespace ripple { class SyncUnorderedMap { public: - typedef RippleRecursiveMutex LockType; + typedef std::recursive_mutex LockType; typedef std::lock_guard ScopedLockType; }; diff --git a/src/ripple/basics/utility/ThreadName.h b/src/ripple/basics/ThreadName.h similarity index 100% rename from src/ripple/basics/utility/ThreadName.h rename to src/ripple/basics/ThreadName.h diff --git a/src/ripple/basics/utility/Time.h b/src/ripple/basics/Time.h similarity index 100% rename from src/ripple/basics/utility/Time.h rename to src/ripple/basics/Time.h diff --git a/src/ripple/basics/utility/ToString.h b/src/ripple/basics/ToString.h similarity index 100% rename from src/ripple/basics/utility/ToString.h rename to src/ripple/basics/ToString.h diff --git a/src/ripple/basics/utility/UptimeTimer.h b/src/ripple/basics/UptimeTimer.h similarity index 98% rename from src/ripple/basics/utility/UptimeTimer.h rename to src/ripple/basics/UptimeTimer.h index a1fc777cca..4a39a509d6 100644 --- a/src/ripple/basics/utility/UptimeTimer.h +++ b/src/ripple/basics/UptimeTimer.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_UPTIMETIMER_H #define RIPPLE_UPTIMETIMER_H +#include + namespace ripple { /** Tracks program uptime. diff --git a/src/ripple/basics/system/CheckLibraryVersions.cpp b/src/ripple/basics/impl/CheckLibraryVersions.cpp similarity index 98% rename from src/ripple/basics/system/CheckLibraryVersions.cpp rename to src/ripple/basics/impl/CheckLibraryVersions.cpp index aef9096c4a..00dc642303 100644 --- a/src/ripple/basics/system/CheckLibraryVersions.cpp +++ b/src/ripple/basics/impl/CheckLibraryVersions.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include namespace ripple { namespace version { diff --git a/src/ripple/basics/utility/CountedObject.cpp b/src/ripple/basics/impl/CountedObject.cpp similarity index 98% rename from src/ripple/basics/utility/CountedObject.cpp rename to src/ripple/basics/impl/CountedObject.cpp index 0542bd2523..faf13942a2 100644 --- a/src/ripple/basics/utility/CountedObject.cpp +++ b/src/ripple/basics/impl/CountedObject.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/basics/log/Log.cpp b/src/ripple/basics/impl/Log.cpp similarity index 100% rename from src/ripple/basics/log/Log.cpp rename to src/ripple/basics/impl/Log.cpp diff --git a/src/ripple/basics/containers/RangeSet.cpp b/src/ripple/basics/impl/RangeSet.cpp similarity index 98% rename from src/ripple/basics/containers/RangeSet.cpp rename to src/ripple/basics/impl/RangeSet.cpp index e00433116e..5f2cd495ce 100644 --- a/src/ripple/basics/containers/RangeSet.cpp +++ b/src/ripple/basics/impl/RangeSet.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/basics/utility/StringUtilities.cpp b/src/ripple/basics/impl/StringUtilities.cpp similarity index 99% rename from src/ripple/basics/utility/StringUtilities.cpp rename to src/ripple/basics/impl/StringUtilities.cpp index 20930fd906..75caf8867a 100644 --- a/src/ripple/basics/utility/StringUtilities.cpp +++ b/src/ripple/basics/impl/StringUtilities.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include +#include #include #include #include #include -#include +#include namespace ripple { diff --git a/src/ripple/basics/utility/Sustain.cpp b/src/ripple/basics/impl/Sustain.cpp similarity index 98% rename from src/ripple/basics/utility/Sustain.cpp rename to src/ripple/basics/impl/Sustain.cpp index 831fac0448..634306b5f0 100644 --- a/src/ripple/basics/utility/Sustain.cpp +++ b/src/ripple/basics/impl/Sustain.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include // For Sustain Linux variants // VFALCO TODO Rewrite Sustain to use beast::Process diff --git a/src/ripple/basics/utility/ThreadName.cpp b/src/ripple/basics/impl/ThreadName.cpp similarity index 100% rename from src/ripple/basics/utility/ThreadName.cpp rename to src/ripple/basics/impl/ThreadName.cpp diff --git a/src/ripple/basics/utility/Time.cpp b/src/ripple/basics/impl/Time.cpp similarity index 100% rename from src/ripple/basics/utility/Time.cpp rename to src/ripple/basics/impl/Time.cpp diff --git a/src/ripple/basics/utility/UptimeTimer.cpp b/src/ripple/basics/impl/UptimeTimer.cpp similarity index 97% rename from src/ripple/basics/utility/UptimeTimer.cpp rename to src/ripple/basics/impl/UptimeTimer.cpp index 3e8aac8586..7b8fa89e2f 100644 --- a/src/ripple/basics/utility/UptimeTimer.cpp +++ b/src/ripple/basics/impl/UptimeTimer.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/basics/utility/PlatformMacros.h b/src/ripple/basics/utility/PlatformMacros.h deleted file mode 100644 index 6d7f7d3591..0000000000 --- a/src/ripple/basics/utility/PlatformMacros.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_PLATFORMMACROS_H -#define RIPPLE_PLATFORMMACROS_H - -#include -#include // - -namespace ripple { - -// VFALCO TODO Clean this stuff up. Remove as much as possible -// DEPRECATED -#define RIPPLE_ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0])) - -} // ripple - -#endif diff --git a/src/ripple/algorithm/api/DecayingSample.h b/src/ripple/common/DecayingSample.h similarity index 96% rename from src/ripple/algorithm/api/DecayingSample.h rename to src/ripple/common/DecayingSample.h index 28168de9f1..e8eafe6a8e 100644 --- a/src/ripple/algorithm/api/DecayingSample.h +++ b/src/ripple/common/DecayingSample.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ALGORITHM_DECAYINGSAMPLE_H_INCLUDED -#define RIPPLE_ALGORITHM_DECAYINGSAMPLE_H_INCLUDED +#ifndef RIPPLE_COMMON_DECAYINGSAMPLE_H_INCLUDED +#define RIPPLE_COMMON_DECAYINGSAMPLE_H_INCLUDED namespace ripple { diff --git a/src/ripple/common/MultiSocket.h b/src/ripple/common/MultiSocket.h index 02843880a3..b917bd0ac7 100644 --- a/src/ripple/common/MultiSocket.h +++ b/src/ripple/common/MultiSocket.h @@ -21,6 +21,9 @@ #define RIPPLE_COMMON_MULTISOCKET_H_INCLUDED #include +#include +#include +#include #include #include #include diff --git a/src/ripple/common/impl/MultiSocketImpl.h b/src/ripple/common/impl/MultiSocketImpl.h index 448b4876b7..197441f96e 100644 --- a/src/ripple/common/impl/MultiSocketImpl.h +++ b/src/ripple/common/impl/MultiSocketImpl.h @@ -24,6 +24,9 @@ #include #include #include +#include +#include +#include #include #include #include diff --git a/src/ripple/module/core/Config.h b/src/ripple/core/Config.h similarity index 99% rename from src/ripple/module/core/Config.h rename to src/ripple/core/Config.h index 9912976c01..c30cd55841 100644 --- a/src/ripple/module/core/Config.h +++ b/src/ripple/core/Config.h @@ -21,8 +21,9 @@ #define RIPPLE_CORE_CONFIG_H_INCLUDED #include -#include +#include #include +#include #include #include #include diff --git a/src/ripple/module/core/ConfigSections.h b/src/ripple/core/ConfigSections.h similarity index 100% rename from src/ripple/module/core/ConfigSections.h rename to src/ripple/core/ConfigSections.h diff --git a/src/ripple/module/core/Job.h b/src/ripple/core/Job.h similarity index 98% rename from src/ripple/module/core/Job.h rename to src/ripple/core/Job.h index 1286c51193..89b7163c10 100644 --- a/src/ripple/module/core/Job.h +++ b/src/ripple/core/Job.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_JOB_H #define RIPPLE_JOB_H -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/module/core/JobQueue.h b/src/ripple/core/JobQueue.h similarity index 94% rename from src/ripple/module/core/JobQueue.h rename to src/ripple/core/JobQueue.h index 0266c44eda..19da732a8b 100644 --- a/src/ripple/module/core/JobQueue.h +++ b/src/ripple/core/JobQueue.h @@ -20,7 +20,8 @@ #ifndef RIPPLE_CORE_JOBQUEUE_H_INCLUDED #define RIPPLE_CORE_JOBQUEUE_H_INCLUDED -#include +#include +#include #include #include @@ -74,7 +75,8 @@ public: virtual Json::Value getJson (int c = 0) = 0; }; -std::unique_ptr make_JobQueue (beast::insight::Collector::ptr const& collector, +std::unique_ptr +make_JobQueue (beast::insight::Collector::ptr const& collector, beast::Stoppable& parent, beast::Journal journal); } diff --git a/src/ripple/module/core/JobTypeData.h b/src/ripple/core/JobTypeData.h similarity index 98% rename from src/ripple/module/core/JobTypeData.h rename to src/ripple/core/JobTypeData.h index 99fcc2e253..1cfa89a1fb 100644 --- a/src/ripple/module/core/JobTypeData.h +++ b/src/ripple/core/JobTypeData.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED #define RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/module/core/JobTypeInfo.h b/src/ripple/core/JobTypeInfo.h similarity index 100% rename from src/ripple/module/core/JobTypeInfo.h rename to src/ripple/core/JobTypeInfo.h diff --git a/src/ripple/module/core/JobTypes.h b/src/ripple/core/JobTypes.h similarity index 98% rename from src/ripple/module/core/JobTypes.h rename to src/ripple/core/JobTypes.h index 6a423159e5..95e9c1dd71 100644 --- a/src/ripple/module/core/JobTypes.h +++ b/src/ripple/core/JobTypes.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_JOBTYPES_H_INCLUDED #define RIPPLE_JOBTYPES_H_INCLUDED -#include -#include +#include +#include #include namespace ripple diff --git a/src/ripple/module/core/LoadEvent.h b/src/ripple/core/LoadEvent.h similarity index 99% rename from src/ripple/module/core/LoadEvent.h rename to src/ripple/core/LoadEvent.h index 302e9a9eaa..a84edb1c87 100644 --- a/src/ripple/module/core/LoadEvent.h +++ b/src/ripple/core/LoadEvent.h @@ -21,6 +21,7 @@ #define RIPPLE_LOADEVENT_H #include +#include namespace ripple { diff --git a/src/ripple/module/core/LoadFeeTrack.h b/src/ripple/core/LoadFeeTrack.h similarity index 96% rename from src/ripple/module/core/LoadFeeTrack.h rename to src/ripple/core/LoadFeeTrack.h index e365d61f23..cd699cc169 100644 --- a/src/ripple/module/core/LoadFeeTrack.h +++ b/src/ripple/core/LoadFeeTrack.h @@ -20,6 +20,10 @@ #ifndef RIPPLE_LOADFEETRACK_H_INCLUDED #define RIPPLE_LOADFEETRACK_H_INCLUDED +#include +#include +#include + namespace ripple { /** Manages the current fee schedule. diff --git a/src/ripple/module/core/LoadMonitor.h b/src/ripple/core/LoadMonitor.h similarity index 95% rename from src/ripple/module/core/LoadMonitor.h rename to src/ripple/core/LoadMonitor.h index 782dcde7b5..9ffaa64e05 100644 --- a/src/ripple/module/core/LoadMonitor.h +++ b/src/ripple/core/LoadMonitor.h @@ -20,7 +20,9 @@ #ifndef RIPPLE_LOADMONITOR_H_INCLUDED #define RIPPLE_LOADMONITOR_H_INCLUDED -#include +#include +#include +#include namespace ripple { @@ -65,7 +67,7 @@ private: void update (); - typedef RippleMutex LockType; + typedef std::mutex LockType; typedef std::lock_guard ScopedLockType; LockType mLock; diff --git a/src/ripple/module/core/Config.cpp b/src/ripple/core/impl/Config.cpp similarity index 99% rename from src/ripple/module/core/Config.cpp rename to src/ripple/core/impl/Config.cpp index 6949680f2e..d7d9166db4 100644 --- a/src/ripple/module/core/Config.cpp +++ b/src/ripple/core/impl/Config.cpp @@ -17,11 +17,19 @@ */ //============================================================================== -#include -#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include - +#include + namespace ripple { // diff --git a/src/ripple/module/core/Job.cpp b/src/ripple/core/impl/Job.cpp similarity index 98% rename from src/ripple/module/core/Job.cpp rename to src/ripple/core/impl/Job.cpp index f77ba3f64f..48499854be 100644 --- a/src/ripple/module/core/Job.cpp +++ b/src/ripple/core/impl/Job.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { Job::Job () diff --git a/src/ripple/module/core/JobQueue.cpp b/src/ripple/core/impl/JobQueue.cpp similarity index 98% rename from src/ripple/module/core/JobQueue.cpp rename to src/ripple/core/impl/JobQueue.cpp index 2d0ec6b162..cb667f489b 100644 --- a/src/ripple/module/core/JobQueue.cpp +++ b/src/ripple/core/impl/JobQueue.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -28,6 +28,8 @@ #include #include +#include +#include namespace ripple { @@ -38,10 +40,10 @@ class JobQueueImp public: typedef std::set JobSet; typedef std::map JobDataMap; - typedef beast::CriticalSection::ScopedLockType ScopedLock; + typedef std::lock_guard ScopedLock; beast::Journal m_journal; - beast::CriticalSection m_mutex; + std::mutex m_mutex; std::uint64_t m_lastJob; JobSet m_jobSet; JobDataMap m_jobData; diff --git a/src/ripple/module/core/LoadEvent.cpp b/src/ripple/core/impl/LoadEvent.cpp similarity index 97% rename from src/ripple/module/core/LoadEvent.cpp rename to src/ripple/core/impl/LoadEvent.cpp index 95b90b20e3..82f0588264 100644 --- a/src/ripple/module/core/LoadEvent.cpp +++ b/src/ripple/core/impl/LoadEvent.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include + namespace ripple { LoadEvent::LoadEvent (LoadMonitor& monitor, std::string const& name, bool shouldStart) diff --git a/src/ripple/module/core/LoadFeeTrackImp.cpp b/src/ripple/core/impl/LoadFeeTrackImp.cpp similarity index 96% rename from src/ripple/module/core/LoadFeeTrackImp.cpp rename to src/ripple/core/impl/LoadFeeTrackImp.cpp index 9700af00e9..b322d37d6a 100644 --- a/src/ripple/module/core/LoadFeeTrackImp.cpp +++ b/src/ripple/core/impl/LoadFeeTrackImp.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include +#include #include namespace ripple { diff --git a/src/ripple/module/core/LoadFeeTrackImp.h b/src/ripple/core/impl/LoadFeeTrackImp.h similarity index 98% rename from src/ripple/module/core/LoadFeeTrackImp.h rename to src/ripple/core/impl/LoadFeeTrackImp.h index b2014764f9..a9ec56e2b3 100644 --- a/src/ripple/module/core/LoadFeeTrackImp.h +++ b/src/ripple/core/impl/LoadFeeTrackImp.h @@ -21,7 +21,8 @@ #define RIPPLE_LOADFEETRACKIMP_H_INCLUDED #include -#include +#include +#include namespace ripple { @@ -222,7 +223,7 @@ private: static const int lftFeeMax = lftNormalFee * 1000000; beast::Journal m_journal; - typedef RippleMutex LockType; + typedef std::mutex LockType; typedef std::lock_guard ScopedLockType; LockType mLock; diff --git a/src/ripple/module/core/LoadMonitor.cpp b/src/ripple/core/impl/LoadMonitor.cpp similarity index 98% rename from src/ripple/module/core/LoadMonitor.cpp rename to src/ripple/core/impl/LoadMonitor.cpp index 9869be72ce..62bc797c59 100644 --- a/src/ripple/module/core/LoadMonitor.cpp +++ b/src/ripple/core/impl/LoadMonitor.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/data/crypto/Base58Data.cpp b/src/ripple/data/crypto/Base58Data.cpp similarity index 100% rename from src/ripple/module/data/crypto/Base58Data.cpp rename to src/ripple/data/crypto/Base58Data.cpp diff --git a/src/ripple/module/data/crypto/Base58Data.h b/src/ripple/data/crypto/Base58Data.h similarity index 98% rename from src/ripple/module/data/crypto/Base58Data.h rename to src/ripple/data/crypto/Base58Data.h index d967be4f00..72a6c38253 100644 --- a/src/ripple/module/data/crypto/Base58Data.h +++ b/src/ripple/data/crypto/Base58Data.h @@ -32,8 +32,8 @@ #ifndef RIPPLE_BASE58DATA_H #define RIPPLE_BASE58DATA_H -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/module/data/crypto/CKey.cpp b/src/ripple/data/crypto/CKey.cpp similarity index 100% rename from src/ripple/module/data/crypto/CKey.cpp rename to src/ripple/data/crypto/CKey.cpp diff --git a/src/ripple/module/data/crypto/CKey.h b/src/ripple/data/crypto/CKey.h similarity index 100% rename from src/ripple/module/data/crypto/CKey.h rename to src/ripple/data/crypto/CKey.h diff --git a/src/ripple/module/data/crypto/CKeyDeterministic.cpp b/src/ripple/data/crypto/CKeyDeterministic.cpp similarity index 100% rename from src/ripple/module/data/crypto/CKeyDeterministic.cpp rename to src/ripple/data/crypto/CKeyDeterministic.cpp diff --git a/src/ripple/module/data/crypto/CKeyECIES.cpp b/src/ripple/data/crypto/CKeyECIES.cpp similarity index 100% rename from src/ripple/module/data/crypto/CKeyECIES.cpp rename to src/ripple/data/crypto/CKeyECIES.cpp diff --git a/src/ripple/module/data/crypto/RFC1751.cpp b/src/ripple/data/crypto/RFC1751.cpp similarity index 100% rename from src/ripple/module/data/crypto/RFC1751.cpp rename to src/ripple/data/crypto/RFC1751.cpp diff --git a/src/ripple/module/data/crypto/RFC1751.h b/src/ripple/data/crypto/RFC1751.h similarity index 100% rename from src/ripple/module/data/crypto/RFC1751.h rename to src/ripple/data/crypto/RFC1751.h diff --git a/src/ripple/module/data/protocol/BuildInfo.cpp b/src/ripple/data/protocol/BuildInfo.cpp similarity index 100% rename from src/ripple/module/data/protocol/BuildInfo.cpp rename to src/ripple/data/protocol/BuildInfo.cpp diff --git a/src/ripple/module/data/protocol/BuildInfo.h b/src/ripple/data/protocol/BuildInfo.h similarity index 100% rename from src/ripple/module/data/protocol/BuildInfo.h rename to src/ripple/data/protocol/BuildInfo.h diff --git a/src/ripple/module/data/protocol/HashPrefix.cpp b/src/ripple/data/protocol/HashPrefix.cpp similarity index 100% rename from src/ripple/module/data/protocol/HashPrefix.cpp rename to src/ripple/data/protocol/HashPrefix.cpp diff --git a/src/ripple/module/data/protocol/HashPrefix.h b/src/ripple/data/protocol/HashPrefix.h similarity index 100% rename from src/ripple/module/data/protocol/HashPrefix.h rename to src/ripple/data/protocol/HashPrefix.h diff --git a/src/ripple/module/data/protocol/KnownFormats.h b/src/ripple/data/protocol/KnownFormats.h similarity index 100% rename from src/ripple/module/data/protocol/KnownFormats.h rename to src/ripple/data/protocol/KnownFormats.h diff --git a/src/ripple/module/data/protocol/LedgerFormats.cpp b/src/ripple/data/protocol/LedgerFormats.cpp similarity index 100% rename from src/ripple/module/data/protocol/LedgerFormats.cpp rename to src/ripple/data/protocol/LedgerFormats.cpp diff --git a/src/ripple/module/data/protocol/LedgerFormats.h b/src/ripple/data/protocol/LedgerFormats.h similarity index 100% rename from src/ripple/module/data/protocol/LedgerFormats.h rename to src/ripple/data/protocol/LedgerFormats.h diff --git a/src/ripple/module/data/protocol/Protocol.h b/src/ripple/data/protocol/Protocol.h similarity index 98% rename from src/ripple/module/data/protocol/Protocol.h rename to src/ripple/data/protocol/Protocol.h index bda1721efc..a8511247b6 100644 --- a/src/ripple/module/data/protocol/Protocol.h +++ b/src/ripple/data/protocol/Protocol.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROTOCOL_H #define RIPPLE_PROTOCOL_H -#include +#include #include namespace ripple { diff --git a/src/ripple/module/data/protocol/RippleAddress.cpp b/src/ripple/data/protocol/RippleAddress.cpp similarity index 99% rename from src/ripple/module/data/protocol/RippleAddress.cpp rename to src/ripple/data/protocol/RippleAddress.cpp index 4512d3b656..299c608674 100644 --- a/src/ripple/module/data/protocol/RippleAddress.cpp +++ b/src/ripple/data/protocol/RippleAddress.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include +#include #include namespace ripple { diff --git a/src/ripple/module/data/protocol/RippleAddress.h b/src/ripple/data/protocol/RippleAddress.h similarity index 94% rename from src/ripple/module/data/protocol/RippleAddress.h rename to src/ripple/data/protocol/RippleAddress.h index be12dc77b7..2a86719bfe 100644 --- a/src/ripple/module/data/protocol/RippleAddress.h +++ b/src/ripple/data/protocol/RippleAddress.h @@ -20,17 +20,17 @@ #ifndef RIPPLE_RIPPLEADDRESS_H #define RIPPLE_RIPPLEADDRESS_H -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/data/protocol/RippleSystem.h b/src/ripple/data/protocol/RippleSystem.h similarity index 100% rename from src/ripple/module/data/protocol/RippleSystem.h rename to src/ripple/data/protocol/RippleSystem.h diff --git a/src/ripple/module/data/protocol/SField.cpp b/src/ripple/data/protocol/SField.cpp similarity index 99% rename from src/ripple/module/data/protocol/SField.cpp rename to src/ripple/data/protocol/SField.cpp index 5427cffac9..ae9a5627f6 100644 --- a/src/ripple/module/data/protocol/SField.cpp +++ b/src/ripple/data/protocol/SField.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/data/protocol/SField.h b/src/ripple/data/protocol/SField.h similarity index 99% rename from src/ripple/module/data/protocol/SField.h rename to src/ripple/data/protocol/SField.h index f4a4096ea5..f00d40cafc 100644 --- a/src/ripple/module/data/protocol/SField.h +++ b/src/ripple/data/protocol/SField.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_FIELDNAMES_H #define RIPPLE_FIELDNAMES_H -#include +#include namespace ripple { diff --git a/src/ripple/module/data/protocol/STAmount.cpp b/src/ripple/data/protocol/STAmount.cpp similarity index 99% rename from src/ripple/module/data/protocol/STAmount.cpp rename to src/ripple/data/protocol/STAmount.cpp index 1738c67247..fc15f58b8e 100644 --- a/src/ripple/module/data/protocol/STAmount.cpp +++ b/src/ripple/data/protocol/STAmount.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/module/data/protocol/STAmount.h b/src/ripple/data/protocol/STAmount.h similarity index 98% rename from src/ripple/module/data/protocol/STAmount.h rename to src/ripple/data/protocol/STAmount.h index 032191fed0..e8b298719a 100644 --- a/src/ripple/module/data/protocol/STAmount.h +++ b/src/ripple/data/protocol/STAmount.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_STAMOUNT_H #define RIPPLE_STAMOUNT_H -#include -#include -#include +#include +#include +#include #include // diff --git a/src/ripple/module/data/protocol/STAmount.test.cpp b/src/ripple/data/protocol/STAmount.test.cpp similarity index 99% rename from src/ripple/module/data/protocol/STAmount.test.cpp rename to src/ripple/data/protocol/STAmount.test.cpp index 2af9e53a2b..0c6b86574e 100644 --- a/src/ripple/module/data/protocol/STAmount.test.cpp +++ b/src/ripple/data/protocol/STAmount.test.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/module/data/protocol/STArray.cpp b/src/ripple/data/protocol/STArray.cpp similarity index 99% rename from src/ripple/module/data/protocol/STArray.cpp rename to src/ripple/data/protocol/STArray.cpp index 14b336b283..ef34827129 100644 --- a/src/ripple/module/data/protocol/STArray.cpp +++ b/src/ripple/data/protocol/STArray.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { std::unique_ptr diff --git a/src/ripple/module/data/protocol/STArray.h b/src/ripple/data/protocol/STArray.h similarity index 98% rename from src/ripple/module/data/protocol/STArray.h rename to src/ripple/data/protocol/STArray.h index 9389743e03..9d98a1dc9d 100644 --- a/src/ripple/module/data/protocol/STArray.h +++ b/src/ripple/data/protocol/STArray.h @@ -20,7 +20,8 @@ #ifndef RIPPLE_STARRAY_H #define RIPPLE_STARRAY_H -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/module/data/protocol/STBitString.h b/src/ripple/data/protocol/STBitString.h similarity index 98% rename from src/ripple/module/data/protocol/STBitString.h rename to src/ripple/data/protocol/STBitString.h index fd6acaab5c..61642bd377 100644 --- a/src/ripple/module/data/protocol/STBitString.h +++ b/src/ripple/data/protocol/STBitString.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_STBITS_H #define RIPPLE_STBITS_H -#include +#include namespace ripple { diff --git a/src/ripple/module/data/protocol/STInteger.cpp b/src/ripple/data/protocol/STInteger.cpp similarity index 97% rename from src/ripple/module/data/protocol/STInteger.cpp rename to src/ripple/data/protocol/STInteger.cpp index e33496b720..ad71c871e0 100644 --- a/src/ripple/module/data/protocol/STInteger.cpp +++ b/src/ripple/data/protocol/STInteger.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/data/protocol/STInteger.h b/src/ripple/data/protocol/STInteger.h similarity index 97% rename from src/ripple/module/data/protocol/STInteger.h rename to src/ripple/data/protocol/STInteger.h index 54a2851c6d..5c283bf356 100644 --- a/src/ripple/module/data/protocol/STInteger.h +++ b/src/ripple/data/protocol/STInteger.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_STINTEGER_H #define RIPPLE_STINTEGER_H -#include +#include namespace ripple { diff --git a/src/ripple/module/data/protocol/STObject.cpp b/src/ripple/data/protocol/STObject.cpp similarity index 99% rename from src/ripple/module/data/protocol/STObject.cpp rename to src/ripple/data/protocol/STObject.cpp index b317af3491..e2e6597d2e 100644 --- a/src/ripple/module/data/protocol/STObject.cpp +++ b/src/ripple/data/protocol/STObject.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include // namespace ripple { diff --git a/src/ripple/module/data/protocol/STObject.h b/src/ripple/data/protocol/STObject.h similarity index 99% rename from src/ripple/module/data/protocol/STObject.h rename to src/ripple/data/protocol/STObject.h index 01607f4fb9..02ae755a41 100644 --- a/src/ripple/module/data/protocol/STObject.h +++ b/src/ripple/data/protocol/STObject.h @@ -20,6 +20,7 @@ #ifndef RIPPLE_STOBJECT_H #define RIPPLE_STOBJECT_H +#include #include namespace ripple { diff --git a/src/ripple/module/data/protocol/STParsedJSON.cpp b/src/ripple/data/protocol/STParsedJSON.cpp similarity index 99% rename from src/ripple/module/data/protocol/STParsedJSON.cpp rename to src/ripple/data/protocol/STParsedJSON.cpp index 60113e4718..21d1b82f9a 100644 --- a/src/ripple/module/data/protocol/STParsedJSON.cpp +++ b/src/ripple/data/protocol/STParsedJSON.cpp @@ -17,7 +17,8 @@ */ //============================================================================== -#include +#include +#include #include #include diff --git a/src/ripple/module/data/protocol/STParsedJSON.h b/src/ripple/data/protocol/STParsedJSON.h similarity index 100% rename from src/ripple/module/data/protocol/STParsedJSON.h rename to src/ripple/data/protocol/STParsedJSON.h diff --git a/src/ripple/module/data/protocol/SerializedObjectTemplate.cpp b/src/ripple/data/protocol/SerializedObjectTemplate.cpp similarity index 100% rename from src/ripple/module/data/protocol/SerializedObjectTemplate.cpp rename to src/ripple/data/protocol/SerializedObjectTemplate.cpp diff --git a/src/ripple/module/data/protocol/SerializedObjectTemplate.h b/src/ripple/data/protocol/SerializedObjectTemplate.h similarity index 100% rename from src/ripple/module/data/protocol/SerializedObjectTemplate.h rename to src/ripple/data/protocol/SerializedObjectTemplate.h diff --git a/src/ripple/module/data/protocol/SerializedType.h b/src/ripple/data/protocol/SerializedType.h similarity index 98% rename from src/ripple/module/data/protocol/SerializedType.h rename to src/ripple/data/protocol/SerializedType.h index cc709f8da8..66f3c019d7 100644 --- a/src/ripple/module/data/protocol/SerializedType.h +++ b/src/ripple/data/protocol/SerializedType.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SERIALIZEDTYPE_H #define RIPPLE_SERIALIZEDTYPE_H -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/module/data/protocol/SerializedTypes.cpp b/src/ripple/data/protocol/SerializedTypes.cpp similarity index 99% rename from src/ripple/module/data/protocol/SerializedTypes.cpp rename to src/ripple/data/protocol/SerializedTypes.cpp index ea423602d2..bea048222e 100644 --- a/src/ripple/module/data/protocol/SerializedTypes.cpp +++ b/src/ripple/data/protocol/SerializedTypes.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include + namespace ripple { const STAmount saZero (noIssue(), 0u); diff --git a/src/ripple/module/data/protocol/SerializedTypes.h b/src/ripple/data/protocol/SerializedTypes.h similarity index 97% rename from src/ripple/module/data/protocol/SerializedTypes.h rename to src/ripple/data/protocol/SerializedTypes.h index 22d4883ac9..abe1d443b7 100644 --- a/src/ripple/module/data/protocol/SerializedTypes.h +++ b/src/ripple/data/protocol/SerializedTypes.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_SERIALIZEDTYPES_H #define RIPPLE_SERIALIZEDTYPES_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/data/protocol/Serializer.cpp b/src/ripple/data/protocol/Serializer.cpp similarity index 99% rename from src/ripple/module/data/protocol/Serializer.cpp rename to src/ripple/data/protocol/Serializer.cpp index f1afc9649c..69b6905b41 100644 --- a/src/ripple/module/data/protocol/Serializer.cpp +++ b/src/ripple/data/protocol/Serializer.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include namespace ripple { diff --git a/src/ripple/module/data/protocol/Serializer.h b/src/ripple/data/protocol/Serializer.h similarity index 100% rename from src/ripple/module/data/protocol/Serializer.h rename to src/ripple/data/protocol/Serializer.h diff --git a/src/ripple/module/data/protocol/TER.cpp b/src/ripple/data/protocol/TER.cpp similarity index 99% rename from src/ripple/module/data/protocol/TER.cpp rename to src/ripple/data/protocol/TER.cpp index cb2bc978dd..987da11ecd 100644 --- a/src/ripple/module/data/protocol/TER.cpp +++ b/src/ripple/data/protocol/TER.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { bool transResultInfo (TER terCode, std::string& strToken, std::string& strHuman) diff --git a/src/ripple/module/data/protocol/TER.h b/src/ripple/data/protocol/TER.h similarity index 100% rename from src/ripple/module/data/protocol/TER.h rename to src/ripple/data/protocol/TER.h diff --git a/src/ripple/module/data/protocol/TxFlags.h b/src/ripple/data/protocol/TxFlags.h similarity index 100% rename from src/ripple/module/data/protocol/TxFlags.h rename to src/ripple/data/protocol/TxFlags.h diff --git a/src/ripple/module/data/protocol/TxFormats.cpp b/src/ripple/data/protocol/TxFormats.cpp similarity index 100% rename from src/ripple/module/data/protocol/TxFormats.cpp rename to src/ripple/data/protocol/TxFormats.cpp diff --git a/src/ripple/module/data/protocol/TxFormats.h b/src/ripple/data/protocol/TxFormats.h similarity index 100% rename from src/ripple/module/data/protocol/TxFormats.h rename to src/ripple/data/protocol/TxFormats.h diff --git a/src/ripple/module/data/utility/UptimeTimerAdapter.h b/src/ripple/data/utility/UptimeTimerAdapter.h similarity index 96% rename from src/ripple/module/data/utility/UptimeTimerAdapter.h rename to src/ripple/data/utility/UptimeTimerAdapter.h index 07fd08d3db..5275e35fbf 100644 --- a/src/ripple/module/data/utility/UptimeTimerAdapter.h +++ b/src/ripple/data/utility/UptimeTimerAdapter.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_UPTIMETIMERADAPTER_H #define RIPPLE_UPTIMETIMERADAPTER_H -#include +#include namespace ripple { diff --git a/src/ripple/json/json_value.h b/src/ripple/json/json_value.h index e82e025321..5912d80dc5 100644 --- a/src/ripple/json/json_value.h +++ b/src/ripple/json/json_value.h @@ -22,6 +22,9 @@ #include #include +#include +#include +#include /** \brief JSON (JavaScript Object Notation). */ @@ -209,6 +212,7 @@ public: */ Value ( const StaticString& value ); Value ( std::string const& value ); + // VFALCO DEPRECATED Avoid this conversion Value (beast::String const& beastString); # ifdef JSON_USE_CPPTL Value ( const CppTL::ConstString& value ); diff --git a/src/ripple/module/net/basics/HTTPClient.h b/src/ripple/net/HTTPClient.h similarity index 95% rename from src/ripple/module/net/basics/HTTPClient.h rename to src/ripple/net/HTTPClient.h index 4105a1dd4e..81f0ae37c0 100644 --- a/src/ripple/module/net/basics/HTTPClient.h +++ b/src/ripple/net/HTTPClient.h @@ -20,6 +20,10 @@ #ifndef RIPPLE_NET_BASICS_HTTPCLIENT_H_INCLUDED #define RIPPLE_NET_BASICS_HTTPCLIENT_H_INCLUDED +#include +#include +#include + namespace ripple { /** Provides an asynchronous HTTP client implementation with optional SSL. diff --git a/src/ripple/module/net/basics/HTTPRequest.h b/src/ripple/net/HTTPRequest.h similarity index 97% rename from src/ripple/module/net/basics/HTTPRequest.h rename to src/ripple/net/HTTPRequest.h index 0feda74239..ce7535de39 100644 --- a/src/ripple/module/net/basics/HTTPRequest.h +++ b/src/ripple/net/HTTPRequest.h @@ -20,6 +20,10 @@ #ifndef RIPPLE_NET_BASICS_HTTPREQUEST_H_INCLUDED #define RIPPLE_NET_BASICS_HTTPREQUEST_H_INCLUDED +#include +#include +#include + namespace ripple { /** An HTTP request we are handling from a client. */ diff --git a/src/ripple/module/net/rpc/InfoSub.h b/src/ripple/net/InfoSub.h similarity index 96% rename from src/ripple/module/net/rpc/InfoSub.h rename to src/ripple/net/InfoSub.h index f212d3b703..61f94eaccf 100644 --- a/src/ripple/module/net/rpc/InfoSub.h +++ b/src/ripple/net/InfoSub.h @@ -20,7 +20,11 @@ #ifndef RIPPLE_NET_RPC_INFOSUB_H_INCLUDED #define RIPPLE_NET_RPC_INFOSUB_H_INCLUDED +#include +#include +#include #include +#include namespace ripple { @@ -115,7 +119,7 @@ public: std::shared_ptr const& getPathRequest (); protected: - typedef RippleMutex LockType; + typedef std::mutex LockType; typedef std::lock_guard ScopedLockType; LockType mLock; diff --git a/src/ripple/module/net/rpc/RPCCall.h b/src/ripple/net/RPCCall.h similarity index 100% rename from src/ripple/module/net/rpc/RPCCall.h rename to src/ripple/net/RPCCall.h diff --git a/src/ripple/module/net/basics/RPCDoor.h b/src/ripple/net/RPCDoor.h similarity index 97% rename from src/ripple/module/net/basics/RPCDoor.h rename to src/ripple/net/RPCDoor.h index 736426653f..d18ccf3193 100644 --- a/src/ripple/module/net/basics/RPCDoor.h +++ b/src/ripple/net/RPCDoor.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_NET_BASICS_RPCDOOR_H_INCLUDED #define RIPPLE_NET_BASICS_RPCDOOR_H_INCLUDED +#include + namespace ripple { /** Listening socket for RPC requests. diff --git a/src/ripple/module/net/rpc/RPCErr.h b/src/ripple/net/RPCErr.h similarity index 100% rename from src/ripple/module/net/rpc/RPCErr.h rename to src/ripple/net/RPCErr.h diff --git a/src/ripple/module/net/basics/RPCServer.h b/src/ripple/net/RPCServer.h similarity index 100% rename from src/ripple/module/net/basics/RPCServer.h rename to src/ripple/net/RPCServer.h diff --git a/src/ripple/module/net/rpc/RPCSub.h b/src/ripple/net/RPCSub.h similarity index 97% rename from src/ripple/module/net/rpc/RPCSub.h rename to src/ripple/net/RPCSub.h index d659f10f0e..34e8ab210c 100644 --- a/src/ripple/module/net/rpc/RPCSub.h +++ b/src/ripple/net/RPCSub.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NET_RPC_RPCSUB_H_INCLUDED #define RIPPLE_NET_RPC_RPCSUB_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/module/net/rpc/RPCUtil.h b/src/ripple/net/RPCUtil.h similarity index 100% rename from src/ripple/module/net/rpc/RPCUtil.h rename to src/ripple/net/RPCUtil.h diff --git a/src/ripple/module/net/basics/SNTPClient.h b/src/ripple/net/SNTPClient.h similarity index 100% rename from src/ripple/module/net/basics/SNTPClient.h rename to src/ripple/net/SNTPClient.h diff --git a/src/ripple/module/net/basics/HTTPClient.cpp b/src/ripple/net/impl/HTTPClient.cpp similarity index 98% rename from src/ripple/module/net/basics/HTTPClient.cpp rename to src/ripple/net/impl/HTTPClient.cpp index 0fef0534e7..294e1f8287 100644 --- a/src/ripple/module/net/basics/HTTPClient.cpp +++ b/src/ripple/net/impl/HTTPClient.cpp @@ -17,9 +17,16 @@ */ //============================================================================== -#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/module/net/basics/HTTPRequest.cpp b/src/ripple/net/impl/HTTPRequest.cpp similarity index 97% rename from src/ripple/module/net/basics/HTTPRequest.cpp rename to src/ripple/net/impl/HTTPRequest.cpp index 9049f3554f..6703e02b4e 100644 --- a/src/ripple/module/net/basics/HTTPRequest.cpp +++ b/src/ripple/net/impl/HTTPRequest.cpp @@ -17,8 +17,10 @@ */ //============================================================================== +#include #include - +#include +#include #include namespace ripple { diff --git a/src/ripple/module/net/rpc/InfoSub.cpp b/src/ripple/net/impl/InfoSub.cpp similarity index 98% rename from src/ripple/module/net/rpc/InfoSub.cpp rename to src/ripple/net/impl/InfoSub.cpp index 367cd67a5a..9fe42452d5 100644 --- a/src/ripple/module/net/rpc/InfoSub.cpp +++ b/src/ripple/net/impl/InfoSub.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include namespace ripple { diff --git a/src/ripple/module/net/rpc/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp similarity index 99% rename from src/ripple/module/net/rpc/RPCCall.cpp rename to src/ripple/net/impl/RPCCall.cpp index 319c91ff03..6eab42afa7 100644 --- a/src/ripple/module/net/rpc/RPCCall.cpp +++ b/src/ripple/net/impl/RPCCall.cpp @@ -17,6 +17,11 @@ */ //============================================================================== +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/module/net/basics/RPCDoor.cpp b/src/ripple/net/impl/RPCDoor.cpp similarity index 98% rename from src/ripple/module/net/basics/RPCDoor.cpp rename to src/ripple/net/impl/RPCDoor.cpp index 8fe29889c8..7128db4a46 100644 --- a/src/ripple/module/net/basics/RPCDoor.cpp +++ b/src/ripple/net/impl/RPCDoor.cpp @@ -17,6 +17,8 @@ //============================================================================== #include +#include +#include namespace ripple { diff --git a/src/ripple/module/net/rpc/RPCErr.cpp b/src/ripple/net/impl/RPCErr.cpp similarity index 100% rename from src/ripple/module/net/rpc/RPCErr.cpp rename to src/ripple/net/impl/RPCErr.cpp diff --git a/src/ripple/module/net/basics/impl/RPCServerImp.h b/src/ripple/net/impl/RPCServerImp.h similarity index 97% rename from src/ripple/module/net/basics/impl/RPCServerImp.h rename to src/ripple/net/impl/RPCServerImp.h index ddf8d39480..73311e4d6a 100644 --- a/src/ripple/module/net/basics/impl/RPCServerImp.h +++ b/src/ripple/net/impl/RPCServerImp.h @@ -17,10 +17,16 @@ */ //============================================================================== +#ifndef RIPPLE_NET_RPCSERVERIMP_H_INCLUDED +#define RIPPLE_NET_RPCSERVERIMP_H_INCLUDED + +#include +#include #include namespace ripple { +// VFALCO DEPRECATED This should no longer be used. class RPCServerImp : public RPCServer , public std::enable_shared_from_this @@ -260,3 +266,5 @@ private: }; } // ripple + +#endif diff --git a/src/ripple/module/net/rpc/RPCSub.cpp b/src/ripple/net/impl/RPCSub.cpp similarity index 98% rename from src/ripple/module/net/rpc/RPCSub.cpp rename to src/ripple/net/impl/RPCSub.cpp index 9227df2b0a..9b27bc4ad5 100644 --- a/src/ripple/module/net/rpc/RPCSub.cpp +++ b/src/ripple/net/impl/RPCSub.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include + namespace ripple { // Subscription object for JSON-RPC diff --git a/src/ripple/module/net/rpc/RPCUtil.cpp b/src/ripple/net/impl/RPCUtil.cpp similarity index 98% rename from src/ripple/module/net/rpc/RPCUtil.cpp rename to src/ripple/net/impl/RPCUtil.cpp index e1d6c1fc0b..c35e095311 100644 --- a/src/ripple/module/net/rpc/RPCUtil.cpp +++ b/src/ripple/net/impl/RPCUtil.cpp @@ -17,6 +17,10 @@ */ //============================================================================== +#include +#include +#include + namespace ripple { unsigned int const gMaxHTTPHeaderSize = 0x02000000; diff --git a/src/ripple/module/net/basics/SNTPClient.cpp b/src/ripple/net/impl/SNTPClient.cpp similarity index 98% rename from src/ripple/module/net/basics/SNTPClient.cpp rename to src/ripple/net/impl/SNTPClient.cpp index bb656d3ca8..eb6a9e6171 100644 --- a/src/ripple/module/net/basics/SNTPClient.cpp +++ b/src/ripple/net/impl/SNTPClient.cpp @@ -17,8 +17,12 @@ */ //============================================================================== +#include +#include +#include #include #include +#include namespace ripple { diff --git a/src/ripple/nodestore/NodeObject.h b/src/ripple/nodestore/NodeObject.h index 0f33f64617..9b8fad07e2 100644 --- a/src/ripple/nodestore/NodeObject.h +++ b/src/ripple/nodestore/NodeObject.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED #define RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED -#include -#include +#include +#include // VFALCO NOTE Intentionally not in the NodeStore namespace diff --git a/src/ripple/nodestore/backend/HyperDBFactory.cpp b/src/ripple/nodestore/backend/HyperDBFactory.cpp index c4d8012ba9..dbbd56230a 100644 --- a/src/ripple/nodestore/backend/HyperDBFactory.cpp +++ b/src/ripple/nodestore/backend/HyperDBFactory.cpp @@ -19,7 +19,7 @@ #if RIPPLE_HYPERLEVELDB_AVAILABLE -#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/backend/LevelDBFactory.cpp b/src/ripple/nodestore/backend/LevelDBFactory.cpp index 3005ad2823..b1139eeb60 100644 --- a/src/ripple/nodestore/backend/LevelDBFactory.cpp +++ b/src/ripple/nodestore/backend/LevelDBFactory.cpp @@ -19,7 +19,7 @@ #if RIPPLE_LEVELDB_AVAILABLE -#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple/nodestore/backend/RocksDBFactory.cpp b/src/ripple/nodestore/backend/RocksDBFactory.cpp index 9fe10c1ee2..07f40d0b7e 100644 --- a/src/ripple/nodestore/backend/RocksDBFactory.cpp +++ b/src/ripple/nodestore/backend/RocksDBFactory.cpp @@ -19,7 +19,7 @@ #if RIPPLE_ROCKSDB_AVAILABLE -#include +#include #include #include diff --git a/src/ripple/nodestore/impl/DatabaseImp.h b/src/ripple/nodestore/impl/DatabaseImp.h index f69a646f48..6deb17bb33 100644 --- a/src/ripple/nodestore/impl/DatabaseImp.h +++ b/src/ripple/nodestore/impl/DatabaseImp.h @@ -21,7 +21,7 @@ #define RIPPLE_NODESTORE_DATABASEIMP_H_INCLUDED #include -#include +#include #include #include #include diff --git a/src/ripple/overlay/Overlay.h b/src/ripple/overlay/Overlay.h index 24b8056da6..f5f0c0b4c9 100644 --- a/src/ripple/overlay/Overlay.h +++ b/src/ripple/overlay/Overlay.h @@ -23,7 +23,7 @@ #include // VFALCO TODO Remove this include dependency it shouldn't be needed -#include +#include #include #include diff --git a/src/ripple/overlay/Peer.h b/src/ripple/overlay/Peer.h index 3f83423ae7..d995e3379c 100644 --- a/src/ripple/overlay/Peer.h +++ b/src/ripple/overlay/Peer.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/src/ripple/overlay/impl/OverlayImpl.h b/src/ripple/overlay/impl/OverlayImpl.h index a70ab042ea..8e6673bc64 100644 --- a/src/ripple/overlay/impl/OverlayImpl.h +++ b/src/ripple/overlay/impl/OverlayImpl.h @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/ripple/overlay/impl/PeerImp.cpp b/src/ripple/overlay/impl/PeerImp.cpp index 193a82e237..397fc08d47 100644 --- a/src/ripple/overlay/impl/PeerImp.cpp +++ b/src/ripple/overlay/impl/PeerImp.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include diff --git a/src/ripple/overlay/impl/PeerImp.h b/src/ripple/overlay/impl/PeerImp.h index c8ba03ecb5..104d2b3dba 100644 --- a/src/ripple/overlay/impl/PeerImp.h +++ b/src/ripple/overlay/impl/PeerImp.h @@ -27,12 +27,11 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include // VFALCO This is unfortunate. Comment this out and @@ -44,6 +43,8 @@ #include #include +#include + #include namespace ripple { diff --git a/src/ripple/peerfinder/api/Callback.h b/src/ripple/peerfinder/Callback.h similarity index 96% rename from src/ripple/peerfinder/api/Callback.h rename to src/ripple/peerfinder/Callback.h index 771b3dac2b..40c51398b0 100644 --- a/src/ripple/peerfinder/api/Callback.h +++ b/src/ripple/peerfinder/Callback.h @@ -20,7 +20,8 @@ #ifndef RIPPLE_PEERFINDER_CALLBACK_H_INCLUDED #define RIPPLE_PEERFINDER_CALLBACK_H_INCLUDED -#include +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/api/Config.h b/src/ripple/peerfinder/Config.h similarity index 100% rename from src/ripple/peerfinder/api/Config.h rename to src/ripple/peerfinder/Config.h diff --git a/src/ripple/peerfinder/api/Endpoint.h b/src/ripple/peerfinder/Endpoint.h similarity index 97% rename from src/ripple/peerfinder/api/Endpoint.h rename to src/ripple/peerfinder/Endpoint.h index 8324253737..6f613330c9 100644 --- a/src/ripple/peerfinder/api/Endpoint.h +++ b/src/ripple/peerfinder/Endpoint.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_PEERFINDER_ENDPOINT_H_INCLUDED #define RIPPLE_PEERFINDER_ENDPOINT_H_INCLUDED +#include + namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/api/Manager.h b/src/ripple/peerfinder/Manager.h similarity index 97% rename from src/ripple/peerfinder/api/Manager.h rename to src/ripple/peerfinder/Manager.h index b0768364af..9bc815297a 100644 --- a/src/ripple/peerfinder/api/Manager.h +++ b/src/ripple/peerfinder/Manager.h @@ -20,12 +20,11 @@ #ifndef RIPPLE_PEERFINDER_MANAGER_H_INCLUDED #define RIPPLE_PEERFINDER_MANAGER_H_INCLUDED -#include -#include -#include - +#include +#include +#include +#include #include - #include namespace ripple { diff --git a/src/ripple/peerfinder/api/Slot.h b/src/ripple/peerfinder/Slot.h similarity index 98% rename from src/ripple/peerfinder/api/Slot.h rename to src/ripple/peerfinder/Slot.h index 246a8db1c6..fb30615ae3 100644 --- a/src/ripple/peerfinder/api/Slot.h +++ b/src/ripple/peerfinder/Slot.h @@ -20,12 +20,9 @@ #ifndef RIPPLE_PEERFINDER_SLOT_H_INCLUDED #define RIPPLE_PEERFINDER_SLOT_H_INCLUDED -#include - +#include #include - #include - #include namespace ripple { diff --git a/src/ripple/peerfinder/api/Types.h b/src/ripple/peerfinder/Types.h similarity index 97% rename from src/ripple/peerfinder/api/Types.h rename to src/ripple/peerfinder/Types.h index 9623c06b2d..01eb7fc1ac 100644 --- a/src/ripple/peerfinder/api/Types.h +++ b/src/ripple/peerfinder/Types.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_TYPES_H_INCLUDED #define RIPPLE_PEERFINDER_TYPES_H_INCLUDED -#include +#include #include diff --git a/src/ripple/peerfinder/impl/Bootcache.cpp b/src/ripple/peerfinder/impl/Bootcache.cpp index 3ff4d77f4f..8570672f88 100644 --- a/src/ripple/peerfinder/impl/Bootcache.cpp +++ b/src/ripple/peerfinder/impl/Bootcache.cpp @@ -18,6 +18,8 @@ //============================================================================== #include +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Bootcache.h b/src/ripple/peerfinder/impl/Bootcache.h index abd3bf77b1..0101a682c4 100644 --- a/src/ripple/peerfinder/impl/Bootcache.h +++ b/src/ripple/peerfinder/impl/Bootcache.h @@ -20,9 +20,14 @@ #ifndef RIPPLE_PEERFINDER_BOOTCACHE_H_INCLUDED #define RIPPLE_PEERFINDER_BOOTCACHE_H_INCLUDED +#include +#include +#include +#include #include #include #include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Checker.cpp b/src/ripple/peerfinder/impl/Checker.cpp index ce13f86756..3f0e7ed73a 100644 --- a/src/ripple/peerfinder/impl/Checker.cpp +++ b/src/ripple/peerfinder/impl/Checker.cpp @@ -17,8 +17,17 @@ */ //============================================================================== -#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace PeerFinder { @@ -50,7 +59,7 @@ private: , private beast::LeakChecked { public: - typedef beast::SharedPtr Ptr; + typedef beast::SharedPtr Ptr; typedef boost::asio::ip::tcp Protocol; typedef boost::system::error_code error_code; typedef Protocol::socket socket_type; diff --git a/src/ripple/peerfinder/impl/CheckerAdapter.h b/src/ripple/peerfinder/impl/CheckerAdapter.h index 616b8cf040..f056b7e1d3 100644 --- a/src/ripple/peerfinder/impl/CheckerAdapter.h +++ b/src/ripple/peerfinder/impl/CheckerAdapter.h @@ -20,6 +20,9 @@ #ifndef RIPPLE_PEERFINDER_CHECKERADAPTER_H_INCLUDED #define RIPPLE_PEERFINDER_CHECKERADAPTER_H_INCLUDED +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/peerfinder/impl/Config.cpp b/src/ripple/peerfinder/impl/Config.cpp index 90e716293a..a6cbb80366 100644 --- a/src/ripple/peerfinder/impl/Config.cpp +++ b/src/ripple/peerfinder/impl/Config.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Counts.h b/src/ripple/peerfinder/impl/Counts.h index 7917195d39..a878f6a554 100644 --- a/src/ripple/peerfinder/impl/Counts.h +++ b/src/ripple/peerfinder/impl/Counts.h @@ -20,7 +20,8 @@ #ifndef RIPPLE_PEERFINDER_COUNTS_H_INCLUDED #define RIPPLE_PEERFINDER_COUNTS_H_INCLUDED -#include +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Endpoint.cpp b/src/ripple/peerfinder/impl/Endpoint.cpp index 7e2887bec9..163d5307ed 100644 --- a/src/ripple/peerfinder/impl/Endpoint.cpp +++ b/src/ripple/peerfinder/impl/Endpoint.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Livecache.cpp b/src/ripple/peerfinder/impl/Livecache.cpp index fbdd9e23b7..81dd068688 100644 --- a/src/ripple/peerfinder/impl/Livecache.cpp +++ b/src/ripple/peerfinder/impl/Livecache.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include diff --git a/src/ripple/peerfinder/impl/Livecache.h b/src/ripple/peerfinder/impl/Livecache.h index 8422e5d27f..181241d9b7 100644 --- a/src/ripple/peerfinder/impl/Livecache.h +++ b/src/ripple/peerfinder/impl/Livecache.h @@ -20,9 +20,11 @@ #ifndef RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED #define RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED +#include +#include +#include #include #include - #include #include diff --git a/src/ripple/peerfinder/impl/Logic.h b/src/ripple/peerfinder/impl/Logic.h index 6a6b4e35f5..d8353f12cf 100644 --- a/src/ripple/peerfinder/impl/Logic.h +++ b/src/ripple/peerfinder/impl/Logic.h @@ -20,13 +20,17 @@ #ifndef RIPPLE_PEERFINDER_LOGIC_H_INCLUDED #define RIPPLE_PEERFINDER_LOGIC_H_INCLUDED -#include -#include - -#include +#include #include +#include +#include +#include +#include #include +#include #include +#include +#include #include diff --git a/src/ripple/peerfinder/impl/Manager.cpp b/src/ripple/peerfinder/impl/Manager.cpp index 7d72ee913e..7fe5db85ee 100644 --- a/src/ripple/peerfinder/impl/Manager.cpp +++ b/src/ripple/peerfinder/impl/Manager.cpp @@ -21,6 +21,13 @@ #include #endif +#include +#include +#include +#include +#include +#include + namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/SlotImp.h b/src/ripple/peerfinder/impl/SlotImp.h index 7eeb654c76..0a7d94f868 100644 --- a/src/ripple/peerfinder/impl/SlotImp.h +++ b/src/ripple/peerfinder/impl/SlotImp.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED #define RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/peerfinder/impl/Source.h b/src/ripple/peerfinder/impl/Source.h index 8510de450e..e85cda965b 100644 --- a/src/ripple/peerfinder/impl/Source.h +++ b/src/ripple/peerfinder/impl/Source.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_PEERFINDER_SOURCE_H_INCLUDED #define RIPPLE_PEERFINDER_SOURCE_H_INCLUDED +#include + namespace ripple { namespace PeerFinder { @@ -38,7 +40,7 @@ public: struct Results { // error_code on a failure - beast::ErrorCode error; + boost::system::error_code error; // list of fetched endpoints IPAddresses addresses; diff --git a/src/ripple/peerfinder/impl/StoreSqdb.h b/src/ripple/peerfinder/impl/StoreSqdb.h index c247c861fd..640951d2c0 100644 --- a/src/ripple/peerfinder/impl/StoreSqdb.h +++ b/src/ripple/peerfinder/impl/StoreSqdb.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_PEERFINDER_STORESQDB_H_INCLUDED #define RIPPLE_PEERFINDER_STORESQDB_H_INCLUDED +#include + namespace ripple { namespace PeerFinder { diff --git a/src/ripple/radmap/README.md b/src/ripple/radmap/README.md deleted file mode 100644 index a27f8f89c2..0000000000 --- a/src/ripple/radmap/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# RadMap - -A RadMap is a combination radix tree and hash map. - -(Formerly known as SHAMap) diff --git a/src/ripple/radmap/TODO.md b/src/ripple/radmap/TODO.md deleted file mode 100644 index d342b2f301..0000000000 --- a/src/ripple/radmap/TODO.md +++ /dev/null @@ -1 +0,0 @@ -# RadMap TODO diff --git a/src/ripple/radmap/api/Tuning.h b/src/ripple/radmap/api/Tuning.h deleted file mode 100644 index db0ad92630..0000000000 --- a/src/ripple/radmap/api/Tuning.h +++ /dev/null @@ -1,36 +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_RADMAP_TUNING_H_INCLUDED -#define RIPPLE_RADMAP_TUNING_H_INCLUDED - -namespace ripple { -namespace RadMap { - -enum -{ - defaultCacheTargetSize = 0 - - ,defaultCacheExpirationSeconds = 120 -}; - -} -} - -#endif diff --git a/src/ripple/resource/api/Consumer.h b/src/ripple/resource/api/Consumer.h index 00ddcb5208..3ea6968e25 100644 --- a/src/ripple/resource/api/Consumer.h +++ b/src/ripple/resource/api/Consumer.h @@ -20,6 +20,7 @@ #ifndef RIPPLE_RESOURCE_CONSUMER_H_INCLUDED #define RIPPLE_RESOURCE_CONSUMER_H_INCLUDED +#include #include namespace ripple { diff --git a/src/ripple/module/rpc/ErrorCodes.h b/src/ripple/rpc/ErrorCodes.h similarity index 100% rename from src/ripple/module/rpc/ErrorCodes.h rename to src/ripple/rpc/ErrorCodes.h diff --git a/src/ripple/module/rpc/InternalHandler.h b/src/ripple/rpc/InternalHandler.h similarity index 100% rename from src/ripple/module/rpc/InternalHandler.h rename to src/ripple/rpc/InternalHandler.h diff --git a/src/ripple/module/rpc/Manager.h b/src/ripple/rpc/Manager.h similarity index 97% rename from src/ripple/module/rpc/Manager.h rename to src/ripple/rpc/Manager.h index 685058dce8..3c823f83f9 100644 --- a/src/ripple/module/rpc/Manager.h +++ b/src/ripple/rpc/Manager.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RPC_MANAGER_H_INCLUDED #define RIPPLE_RPC_MANAGER_H_INCLUDED -#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/README.md b/src/ripple/rpc/README.md similarity index 100% rename from src/ripple/module/rpc/README.md rename to src/ripple/rpc/README.md diff --git a/src/ripple/module/rpc/RPCHandler.h b/src/ripple/rpc/RPCHandler.h similarity index 80% rename from src/ripple/module/rpc/RPCHandler.h rename to src/ripple/rpc/RPCHandler.h index 0f6f0b79d0..b0864f2089 100644 --- a/src/ripple/module/rpc/RPCHandler.h +++ b/src/ripple/rpc/RPCHandler.h @@ -20,16 +20,16 @@ #ifndef RIPPLE_APP_RPC_HANDLER #define RIPPLE_APP_RPC_HANDLER -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/rpc/RPCServerHandler.h b/src/ripple/rpc/RPCServerHandler.h similarity index 100% rename from src/ripple/module/rpc/RPCServerHandler.h rename to src/ripple/rpc/RPCServerHandler.h diff --git a/src/ripple/module/rpc/Request.h b/src/ripple/rpc/Request.h similarity index 100% rename from src/ripple/module/rpc/Request.h rename to src/ripple/rpc/Request.h diff --git a/src/ripple/module/rpc/TODO.md b/src/ripple/rpc/TODO.md similarity index 100% rename from src/ripple/module/rpc/TODO.md rename to src/ripple/rpc/TODO.md diff --git a/src/ripple/module/rpc/Tuning.h b/src/ripple/rpc/Tuning.h similarity index 100% rename from src/ripple/module/rpc/Tuning.h rename to src/ripple/rpc/Tuning.h diff --git a/src/ripple/module/rpc/handlers/AccountCurrencies.cpp b/src/ripple/rpc/handlers/AccountCurrencies.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/AccountCurrencies.cpp rename to src/ripple/rpc/handlers/AccountCurrencies.cpp diff --git a/src/ripple/module/rpc/handlers/AccountInfo.cpp b/src/ripple/rpc/handlers/AccountInfo.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/AccountInfo.cpp rename to src/ripple/rpc/handlers/AccountInfo.cpp diff --git a/src/ripple/module/rpc/handlers/AccountLines.cpp b/src/ripple/rpc/handlers/AccountLines.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/AccountLines.cpp rename to src/ripple/rpc/handlers/AccountLines.cpp diff --git a/src/ripple/module/rpc/handlers/AccountOffers.cpp b/src/ripple/rpc/handlers/AccountOffers.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/AccountOffers.cpp rename to src/ripple/rpc/handlers/AccountOffers.cpp diff --git a/src/ripple/module/rpc/handlers/AccountTx.cpp b/src/ripple/rpc/handlers/AccountTx.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/AccountTx.cpp rename to src/ripple/rpc/handlers/AccountTx.cpp diff --git a/src/ripple/module/rpc/handlers/AccountTxOld.cpp b/src/ripple/rpc/handlers/AccountTxOld.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/AccountTxOld.cpp rename to src/ripple/rpc/handlers/AccountTxOld.cpp diff --git a/src/ripple/module/rpc/handlers/AccountTxSwitch.cpp b/src/ripple/rpc/handlers/AccountTxSwitch.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/AccountTxSwitch.cpp rename to src/ripple/rpc/handlers/AccountTxSwitch.cpp diff --git a/src/ripple/module/rpc/handlers/BlackList.cpp b/src/ripple/rpc/handlers/BlackList.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/BlackList.cpp rename to src/ripple/rpc/handlers/BlackList.cpp diff --git a/src/ripple/module/rpc/handlers/BookOffers.cpp b/src/ripple/rpc/handlers/BookOffers.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/BookOffers.cpp rename to src/ripple/rpc/handlers/BookOffers.cpp diff --git a/src/ripple/module/rpc/handlers/Connect.cpp b/src/ripple/rpc/handlers/Connect.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Connect.cpp rename to src/ripple/rpc/handlers/Connect.cpp diff --git a/src/ripple/module/rpc/handlers/ConsensusInfo.cpp b/src/ripple/rpc/handlers/ConsensusInfo.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/ConsensusInfo.cpp rename to src/ripple/rpc/handlers/ConsensusInfo.cpp diff --git a/src/ripple/module/rpc/handlers/Feature.cpp b/src/ripple/rpc/handlers/Feature.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Feature.cpp rename to src/ripple/rpc/handlers/Feature.cpp diff --git a/src/ripple/module/rpc/handlers/FetchInfo.cpp b/src/ripple/rpc/handlers/FetchInfo.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/FetchInfo.cpp rename to src/ripple/rpc/handlers/FetchInfo.cpp diff --git a/src/ripple/module/rpc/handlers/GetCounts.cpp b/src/ripple/rpc/handlers/GetCounts.cpp similarity index 99% rename from src/ripple/module/rpc/handlers/GetCounts.cpp rename to src/ripple/rpc/handlers/GetCounts.cpp index 989fd3bb8c..f41e27864c 100644 --- a/src/ripple/module/rpc/handlers/GetCounts.cpp +++ b/src/ripple/rpc/handlers/GetCounts.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include namespace ripple { diff --git a/src/ripple/module/rpc/handlers/Handlers.h b/src/ripple/rpc/handlers/Handlers.h similarity index 100% rename from src/ripple/module/rpc/handlers/Handlers.h rename to src/ripple/rpc/handlers/Handlers.h diff --git a/src/ripple/module/rpc/handlers/Internal.cpp b/src/ripple/rpc/handlers/Internal.cpp similarity index 97% rename from src/ripple/module/rpc/handlers/Internal.cpp rename to src/ripple/rpc/handlers/Internal.cpp index e969a9a421..9612bde328 100644 --- a/src/ripple/module/rpc/handlers/Internal.cpp +++ b/src/ripple/rpc/handlers/Internal.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/rpc/handlers/Ledger.cpp b/src/ripple/rpc/handlers/Ledger.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Ledger.cpp rename to src/ripple/rpc/handlers/Ledger.cpp diff --git a/src/ripple/module/rpc/handlers/LedgerAccept.cpp b/src/ripple/rpc/handlers/LedgerAccept.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/LedgerAccept.cpp rename to src/ripple/rpc/handlers/LedgerAccept.cpp diff --git a/src/ripple/module/rpc/handlers/LedgerCleaner.cpp b/src/ripple/rpc/handlers/LedgerCleaner.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/LedgerCleaner.cpp rename to src/ripple/rpc/handlers/LedgerCleaner.cpp diff --git a/src/ripple/module/rpc/handlers/LedgerClosed.cpp b/src/ripple/rpc/handlers/LedgerClosed.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/LedgerClosed.cpp rename to src/ripple/rpc/handlers/LedgerClosed.cpp diff --git a/src/ripple/module/rpc/handlers/LedgerCurrent.cpp b/src/ripple/rpc/handlers/LedgerCurrent.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/LedgerCurrent.cpp rename to src/ripple/rpc/handlers/LedgerCurrent.cpp diff --git a/src/ripple/module/rpc/handlers/LedgerData.cpp b/src/ripple/rpc/handlers/LedgerData.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/LedgerData.cpp rename to src/ripple/rpc/handlers/LedgerData.cpp diff --git a/src/ripple/module/rpc/handlers/LedgerEntry.cpp b/src/ripple/rpc/handlers/LedgerEntry.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/LedgerEntry.cpp rename to src/ripple/rpc/handlers/LedgerEntry.cpp diff --git a/src/ripple/module/rpc/handlers/LedgerHeader.cpp b/src/ripple/rpc/handlers/LedgerHeader.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/LedgerHeader.cpp rename to src/ripple/rpc/handlers/LedgerHeader.cpp diff --git a/src/ripple/module/rpc/handlers/LedgerRequest.cpp b/src/ripple/rpc/handlers/LedgerRequest.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/LedgerRequest.cpp rename to src/ripple/rpc/handlers/LedgerRequest.cpp diff --git a/src/ripple/module/rpc/handlers/LogLevel.cpp b/src/ripple/rpc/handlers/LogLevel.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/LogLevel.cpp rename to src/ripple/rpc/handlers/LogLevel.cpp diff --git a/src/ripple/module/rpc/handlers/LogRotate.cpp b/src/ripple/rpc/handlers/LogRotate.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/LogRotate.cpp rename to src/ripple/rpc/handlers/LogRotate.cpp diff --git a/src/ripple/module/rpc/handlers/OwnerInfo.cpp b/src/ripple/rpc/handlers/OwnerInfo.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/OwnerInfo.cpp rename to src/ripple/rpc/handlers/OwnerInfo.cpp diff --git a/src/ripple/module/rpc/handlers/PathFind.cpp b/src/ripple/rpc/handlers/PathFind.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/PathFind.cpp rename to src/ripple/rpc/handlers/PathFind.cpp diff --git a/src/ripple/module/rpc/handlers/Peers.cpp b/src/ripple/rpc/handlers/Peers.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Peers.cpp rename to src/ripple/rpc/handlers/Peers.cpp diff --git a/src/ripple/module/rpc/handlers/Ping.cpp b/src/ripple/rpc/handlers/Ping.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Ping.cpp rename to src/ripple/rpc/handlers/Ping.cpp diff --git a/src/ripple/module/rpc/handlers/Print.cpp b/src/ripple/rpc/handlers/Print.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Print.cpp rename to src/ripple/rpc/handlers/Print.cpp diff --git a/src/ripple/module/rpc/handlers/ProofCreate.cpp b/src/ripple/rpc/handlers/ProofCreate.cpp similarity index 97% rename from src/ripple/module/rpc/handlers/ProofCreate.cpp rename to src/ripple/rpc/handlers/ProofCreate.cpp index 213aa22710..cbed63d99b 100644 --- a/src/ripple/module/rpc/handlers/ProofCreate.cpp +++ b/src/ripple/rpc/handlers/ProofCreate.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/rpc/handlers/ProofSolve.cpp b/src/ripple/rpc/handlers/ProofSolve.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/ProofSolve.cpp rename to src/ripple/rpc/handlers/ProofSolve.cpp diff --git a/src/ripple/module/rpc/handlers/ProofVerify.cpp b/src/ripple/rpc/handlers/ProofVerify.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/ProofVerify.cpp rename to src/ripple/rpc/handlers/ProofVerify.cpp diff --git a/src/ripple/module/rpc/handlers/Random.cpp b/src/ripple/rpc/handlers/Random.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Random.cpp rename to src/ripple/rpc/handlers/Random.cpp diff --git a/src/ripple/module/rpc/handlers/RipplePathFind.cpp b/src/ripple/rpc/handlers/RipplePathFind.cpp similarity index 99% rename from src/ripple/module/rpc/handlers/RipplePathFind.cpp rename to src/ripple/rpc/handlers/RipplePathFind.cpp index 8c19803eb2..5e48f7f66d 100644 --- a/src/ripple/module/rpc/handlers/RipplePathFind.cpp +++ b/src/ripple/rpc/handlers/RipplePathFind.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/rpc/handlers/SMS.cpp b/src/ripple/rpc/handlers/SMS.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/SMS.cpp rename to src/ripple/rpc/handlers/SMS.cpp diff --git a/src/ripple/module/rpc/handlers/ServerInfo.cpp b/src/ripple/rpc/handlers/ServerInfo.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/ServerInfo.cpp rename to src/ripple/rpc/handlers/ServerInfo.cpp diff --git a/src/ripple/module/rpc/handlers/ServerState.cpp b/src/ripple/rpc/handlers/ServerState.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/ServerState.cpp rename to src/ripple/rpc/handlers/ServerState.cpp diff --git a/src/ripple/module/rpc/handlers/Sign.cpp b/src/ripple/rpc/handlers/Sign.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Sign.cpp rename to src/ripple/rpc/handlers/Sign.cpp diff --git a/src/ripple/module/rpc/handlers/Stop.cpp b/src/ripple/rpc/handlers/Stop.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Stop.cpp rename to src/ripple/rpc/handlers/Stop.cpp diff --git a/src/ripple/module/rpc/handlers/Submit.cpp b/src/ripple/rpc/handlers/Submit.cpp similarity index 98% rename from src/ripple/module/rpc/handlers/Submit.cpp rename to src/ripple/rpc/handlers/Submit.cpp index e1c54aa3c4..8f374d4cc7 100644 --- a/src/ripple/module/rpc/handlers/Submit.cpp +++ b/src/ripple/rpc/handlers/Submit.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include namespace ripple { diff --git a/src/ripple/module/rpc/handlers/Subscribe.cpp b/src/ripple/rpc/handlers/Subscribe.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Subscribe.cpp rename to src/ripple/rpc/handlers/Subscribe.cpp diff --git a/src/ripple/module/rpc/handlers/TransactionEntry.cpp b/src/ripple/rpc/handlers/TransactionEntry.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/TransactionEntry.cpp rename to src/ripple/rpc/handlers/TransactionEntry.cpp diff --git a/src/ripple/module/rpc/handlers/Tx.cpp b/src/ripple/rpc/handlers/Tx.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Tx.cpp rename to src/ripple/rpc/handlers/Tx.cpp diff --git a/src/ripple/module/rpc/handlers/TxHistory.cpp b/src/ripple/rpc/handlers/TxHistory.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/TxHistory.cpp rename to src/ripple/rpc/handlers/TxHistory.cpp diff --git a/src/ripple/module/rpc/handlers/UnlAdd.cpp b/src/ripple/rpc/handlers/UnlAdd.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/UnlAdd.cpp rename to src/ripple/rpc/handlers/UnlAdd.cpp diff --git a/src/ripple/module/rpc/handlers/UnlDelete.cpp b/src/ripple/rpc/handlers/UnlDelete.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/UnlDelete.cpp rename to src/ripple/rpc/handlers/UnlDelete.cpp diff --git a/src/ripple/module/rpc/handlers/UnlList.cpp b/src/ripple/rpc/handlers/UnlList.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/UnlList.cpp rename to src/ripple/rpc/handlers/UnlList.cpp diff --git a/src/ripple/module/rpc/handlers/UnlLoad.cpp b/src/ripple/rpc/handlers/UnlLoad.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/UnlLoad.cpp rename to src/ripple/rpc/handlers/UnlLoad.cpp diff --git a/src/ripple/module/rpc/handlers/UnlNetwork.cpp b/src/ripple/rpc/handlers/UnlNetwork.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/UnlNetwork.cpp rename to src/ripple/rpc/handlers/UnlNetwork.cpp diff --git a/src/ripple/module/rpc/handlers/UnlReset.cpp b/src/ripple/rpc/handlers/UnlReset.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/UnlReset.cpp rename to src/ripple/rpc/handlers/UnlReset.cpp diff --git a/src/ripple/module/rpc/handlers/UnlScore.cpp b/src/ripple/rpc/handlers/UnlScore.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/UnlScore.cpp rename to src/ripple/rpc/handlers/UnlScore.cpp diff --git a/src/ripple/module/rpc/handlers/Unsubscribe.cpp b/src/ripple/rpc/handlers/Unsubscribe.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/Unsubscribe.cpp rename to src/ripple/rpc/handlers/Unsubscribe.cpp diff --git a/src/ripple/module/rpc/handlers/ValidationCreate.cpp b/src/ripple/rpc/handlers/ValidationCreate.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/ValidationCreate.cpp rename to src/ripple/rpc/handlers/ValidationCreate.cpp diff --git a/src/ripple/module/rpc/handlers/ValidationSeed.cpp b/src/ripple/rpc/handlers/ValidationSeed.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/ValidationSeed.cpp rename to src/ripple/rpc/handlers/ValidationSeed.cpp diff --git a/src/ripple/module/rpc/handlers/WalletAccounts.cpp b/src/ripple/rpc/handlers/WalletAccounts.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/WalletAccounts.cpp rename to src/ripple/rpc/handlers/WalletAccounts.cpp diff --git a/src/ripple/module/rpc/handlers/WalletPropose.cpp b/src/ripple/rpc/handlers/WalletPropose.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/WalletPropose.cpp rename to src/ripple/rpc/handlers/WalletPropose.cpp diff --git a/src/ripple/module/rpc/handlers/WalletSeed.cpp b/src/ripple/rpc/handlers/WalletSeed.cpp similarity index 100% rename from src/ripple/module/rpc/handlers/WalletSeed.cpp rename to src/ripple/rpc/handlers/WalletSeed.cpp diff --git a/src/ripple/module/rpc/impl/AccountFromString.cpp b/src/ripple/rpc/impl/AccountFromString.cpp similarity index 98% rename from src/ripple/module/rpc/impl/AccountFromString.cpp rename to src/ripple/rpc/impl/AccountFromString.cpp index b3ee7437aa..ca86e4c7ab 100644 --- a/src/ripple/module/rpc/impl/AccountFromString.cpp +++ b/src/ripple/rpc/impl/AccountFromString.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/AccountFromString.h b/src/ripple/rpc/impl/AccountFromString.h similarity index 100% rename from src/ripple/module/rpc/impl/AccountFromString.h rename to src/ripple/rpc/impl/AccountFromString.h diff --git a/src/ripple/module/rpc/impl/Accounts.cpp b/src/ripple/rpc/impl/Accounts.cpp similarity index 97% rename from src/ripple/module/rpc/impl/Accounts.cpp rename to src/ripple/rpc/impl/Accounts.cpp index 0beb06430f..d99df993bd 100644 --- a/src/ripple/module/rpc/impl/Accounts.cpp +++ b/src/ripple/rpc/impl/Accounts.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/Accounts.h b/src/ripple/rpc/impl/Accounts.h similarity index 100% rename from src/ripple/module/rpc/impl/Accounts.h rename to src/ripple/rpc/impl/Accounts.h diff --git a/src/ripple/module/rpc/impl/Authorize.cpp b/src/ripple/rpc/impl/Authorize.cpp similarity index 99% rename from src/ripple/module/rpc/impl/Authorize.cpp rename to src/ripple/rpc/impl/Authorize.cpp index 766620d2bf..022eae17e2 100644 --- a/src/ripple/module/rpc/impl/Authorize.cpp +++ b/src/ripple/rpc/impl/Authorize.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/Authorize.h b/src/ripple/rpc/impl/Authorize.h similarity index 100% rename from src/ripple/module/rpc/impl/Authorize.h rename to src/ripple/rpc/impl/Authorize.h diff --git a/src/ripple/module/rpc/impl/Command.h b/src/ripple/rpc/impl/Command.h similarity index 100% rename from src/ripple/module/rpc/impl/Command.h rename to src/ripple/rpc/impl/Command.h diff --git a/src/ripple/module/rpc/impl/Context.h b/src/ripple/rpc/impl/Context.h similarity index 97% rename from src/ripple/module/rpc/impl/Context.h rename to src/ripple/rpc/impl/Context.h index 783fce0dde..0f566d4ee2 100644 --- a/src/ripple/module/rpc/impl/Context.h +++ b/src/ripple/rpc/impl/Context.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RPC_CONTEXT #define RIPPLE_RPC_CONTEXT -#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/DoPrint.h b/src/ripple/rpc/impl/DoPrint.h similarity index 100% rename from src/ripple/module/rpc/impl/DoPrint.h rename to src/ripple/rpc/impl/DoPrint.h diff --git a/src/ripple/module/rpc/impl/ErrorCodes.cpp b/src/ripple/rpc/impl/ErrorCodes.cpp similarity index 99% rename from src/ripple/module/rpc/impl/ErrorCodes.cpp rename to src/ripple/rpc/impl/ErrorCodes.cpp index f27f8c6633..a2a62be3dd 100644 --- a/src/ripple/module/rpc/impl/ErrorCodes.cpp +++ b/src/ripple/rpc/impl/ErrorCodes.cpp @@ -19,7 +19,7 @@ #include -#include +#include namespace std { diff --git a/src/ripple/module/rpc/impl/GetMasterGenerator.cpp b/src/ripple/rpc/impl/GetMasterGenerator.cpp similarity index 97% rename from src/ripple/module/rpc/impl/GetMasterGenerator.cpp rename to src/ripple/rpc/impl/GetMasterGenerator.cpp index 6ab7ecf77c..ce36ffd17b 100644 --- a/src/ripple/module/rpc/impl/GetMasterGenerator.cpp +++ b/src/ripple/rpc/impl/GetMasterGenerator.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/GetMasterGenerator.h b/src/ripple/rpc/impl/GetMasterGenerator.h similarity index 100% rename from src/ripple/module/rpc/impl/GetMasterGenerator.h rename to src/ripple/rpc/impl/GetMasterGenerator.h diff --git a/src/ripple/module/rpc/impl/Handler.cpp b/src/ripple/rpc/impl/Handler.cpp similarity index 98% rename from src/ripple/module/rpc/impl/Handler.cpp rename to src/ripple/rpc/impl/Handler.cpp index 49d03ec5da..66d02ae1a5 100644 --- a/src/ripple/module/rpc/impl/Handler.cpp +++ b/src/ripple/rpc/impl/Handler.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/Handler.h b/src/ripple/rpc/impl/Handler.h similarity index 95% rename from src/ripple/module/rpc/impl/Handler.h rename to src/ripple/rpc/impl/Handler.h index 57e90098a4..6afe26bdc3 100644 --- a/src/ripple/module/rpc/impl/Handler.h +++ b/src/ripple/rpc/impl/Handler.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RPC_HANDLER #define RIPPLE_RPC_HANDLER -#include -#include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/LegacyPathFind.cpp b/src/ripple/rpc/impl/LegacyPathFind.cpp similarity index 95% rename from src/ripple/module/rpc/impl/LegacyPathFind.cpp rename to src/ripple/rpc/impl/LegacyPathFind.cpp index a3cfadca15..7077cba1c7 100644 --- a/src/ripple/module/rpc/impl/LegacyPathFind.cpp +++ b/src/ripple/rpc/impl/LegacyPathFind.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/LegacyPathFind.h b/src/ripple/rpc/impl/LegacyPathFind.h similarity index 100% rename from src/ripple/module/rpc/impl/LegacyPathFind.h rename to src/ripple/rpc/impl/LegacyPathFind.h diff --git a/src/ripple/module/rpc/impl/LookupLedger.cpp b/src/ripple/rpc/impl/LookupLedger.cpp similarity index 99% rename from src/ripple/module/rpc/impl/LookupLedger.cpp rename to src/ripple/rpc/impl/LookupLedger.cpp index 018819810b..6b7ac0085d 100644 --- a/src/ripple/module/rpc/impl/LookupLedger.cpp +++ b/src/ripple/rpc/impl/LookupLedger.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/LookupLedger.h b/src/ripple/rpc/impl/LookupLedger.h similarity index 100% rename from src/ripple/module/rpc/impl/LookupLedger.h rename to src/ripple/rpc/impl/LookupLedger.h diff --git a/src/ripple/module/rpc/impl/Manager.cpp b/src/ripple/rpc/impl/Manager.cpp similarity index 96% rename from src/ripple/module/rpc/impl/Manager.cpp rename to src/ripple/rpc/impl/Manager.cpp index 4ef2b95c73..b5dd9a3e45 100644 --- a/src/ripple/module/rpc/impl/Manager.cpp +++ b/src/ripple/rpc/impl/Manager.cpp @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/ParseAccountIds.cpp b/src/ripple/rpc/impl/ParseAccountIds.cpp similarity index 96% rename from src/ripple/module/rpc/impl/ParseAccountIds.cpp rename to src/ripple/rpc/impl/ParseAccountIds.cpp index 204b3c3469..90d6d551b6 100644 --- a/src/ripple/module/rpc/impl/ParseAccountIds.cpp +++ b/src/ripple/rpc/impl/ParseAccountIds.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple/module/rpc/impl/ParseAccountIds.h b/src/ripple/rpc/impl/ParseAccountIds.h similarity index 100% rename from src/ripple/module/rpc/impl/ParseAccountIds.h rename to src/ripple/rpc/impl/ParseAccountIds.h diff --git a/src/ripple/module/rpc/impl/RPCHandler.cpp b/src/ripple/rpc/impl/RPCHandler.cpp similarity index 95% rename from src/ripple/module/rpc/impl/RPCHandler.cpp rename to src/ripple/rpc/impl/RPCHandler.cpp index 74b4132a5b..d0b8bd91b5 100644 --- a/src/ripple/module/rpc/impl/RPCHandler.cpp +++ b/src/ripple/rpc/impl/RPCHandler.cpp @@ -18,12 +18,12 @@ //============================================================================== #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/rpc/impl/RPCServerHandler.cpp b/src/ripple/rpc/impl/RPCServerHandler.cpp similarity index 95% rename from src/ripple/module/rpc/impl/RPCServerHandler.cpp rename to src/ripple/rpc/impl/RPCServerHandler.cpp index 75b2df0ed6..8620c999d0 100644 --- a/src/ripple/module/rpc/impl/RPCServerHandler.cpp +++ b/src/ripple/rpc/impl/RPCServerHandler.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/rpc/impl/TransactionSign.cpp b/src/ripple/rpc/impl/TransactionSign.cpp similarity index 99% rename from src/ripple/module/rpc/impl/TransactionSign.cpp rename to src/ripple/rpc/impl/TransactionSign.cpp index b9cc821039..1250262425 100644 --- a/src/ripple/module/rpc/impl/TransactionSign.cpp +++ b/src/ripple/rpc/impl/TransactionSign.cpp @@ -17,7 +17,8 @@ */ //============================================================================== -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/module/rpc/impl/TransactionSign.h b/src/ripple/rpc/impl/TransactionSign.h similarity index 100% rename from src/ripple/module/rpc/impl/TransactionSign.h rename to src/ripple/rpc/impl/TransactionSign.h diff --git a/src/ripple/sitefiles/api/Manager.h b/src/ripple/sitefiles/api/Manager.h index 9c3c486fa2..a6856e9175 100644 --- a/src/ripple/sitefiles/api/Manager.h +++ b/src/ripple/sitefiles/api/Manager.h @@ -22,6 +22,7 @@ #include +#include #include namespace ripple { diff --git a/src/ripple/sslutil/api/CAutoBN_CTX.h b/src/ripple/sslutil/CAutoBN_CTX.h similarity index 97% rename from src/ripple/sslutil/api/CAutoBN_CTX.h rename to src/ripple/sslutil/CAutoBN_CTX.h index 2c3467f79e..21d8d1f19e 100644 --- a/src/ripple/sslutil/api/CAutoBN_CTX.h +++ b/src/ripple/sslutil/CAutoBN_CTX.h @@ -25,7 +25,7 @@ #ifndef RIPPLE_SSLUTIL_CAUTOBN_CTX_H_INCLUDED #define RIPPLE_SSLUTIL_CAUTOBN_CTX_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/sslutil/api/CBigNum.h b/src/ripple/sslutil/CBigNum.h similarity index 100% rename from src/ripple/sslutil/api/CBigNum.h rename to src/ripple/sslutil/CBigNum.h diff --git a/src/ripple/sslutil/api/DHUtil.h b/src/ripple/sslutil/DHUtil.h similarity index 100% rename from src/ripple/sslutil/api/DHUtil.h rename to src/ripple/sslutil/DHUtil.h diff --git a/src/ripple/sslutil/api/ECDSACanonical.h b/src/ripple/sslutil/ECDSACanonical.h similarity index 100% rename from src/ripple/sslutil/api/ECDSACanonical.h rename to src/ripple/sslutil/ECDSACanonical.h diff --git a/src/ripple/sslutil/api/bignum_error.h b/src/ripple/sslutil/bignum_error.h similarity index 100% rename from src/ripple/sslutil/api/bignum_error.h rename to src/ripple/sslutil/bignum_error.h diff --git a/src/ripple/types/api/AgedHistory.h b/src/ripple/types/AgedHistory.h similarity index 100% rename from src/ripple/types/api/AgedHistory.h rename to src/ripple/types/AgedHistory.h diff --git a/src/ripple/types/api/Base58.h b/src/ripple/types/Base58.h similarity index 99% rename from src/ripple/types/api/Base58.h rename to src/ripple/types/Base58.h index efad0ccd9e..f1de7d2570 100644 --- a/src/ripple/types/api/Base58.h +++ b/src/ripple/types/Base58.h @@ -32,7 +32,7 @@ #ifndef RIPPLE_TYPES_BASE58_H #define RIPPLE_TYPES_BASE58_H -#include +#include #include #include #include diff --git a/src/ripple/types/api/Blob.h b/src/ripple/types/Blob.h similarity index 100% rename from src/ripple/types/api/Blob.h rename to src/ripple/types/Blob.h diff --git a/src/ripple/types/api/Book.h b/src/ripple/types/Book.h similarity index 99% rename from src/ripple/types/api/Book.h rename to src/ripple/types/Book.h index bf7a7f7f05..8cb1f933c0 100644 --- a/src/ripple/types/api/Book.h +++ b/src/ripple/types/Book.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_BOOK_H_INCLUDED #define RIPPLE_TYPES_BOOK_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/types/api/ByteOrder.h b/src/ripple/types/ByteOrder.h similarity index 100% rename from src/ripple/types/api/ByteOrder.h rename to src/ripple/types/ByteOrder.h diff --git a/src/ripple/types/api/CryptoIdentifier.h b/src/ripple/types/CryptoIdentifier.h similarity index 98% rename from src/ripple/types/api/CryptoIdentifier.h rename to src/ripple/types/CryptoIdentifier.h index 5d71e6754e..caab5dbd94 100644 --- a/src/ripple/types/api/CryptoIdentifier.h +++ b/src/ripple/types/CryptoIdentifier.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TYPES_CRYPTOIDENTIFIER_H_INCLUDED #define RIPPLE_TYPES_CRYPTOIDENTIFIER_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/types/api/HashMaps.h b/src/ripple/types/HashMaps.h similarity index 100% rename from src/ripple/types/api/HashMaps.h rename to src/ripple/types/HashMaps.h diff --git a/src/ripple/types/api/IdentifierStorage.h b/src/ripple/types/IdentifierStorage.h similarity index 100% rename from src/ripple/types/api/IdentifierStorage.h rename to src/ripple/types/IdentifierStorage.h diff --git a/src/ripple/types/api/IdentifierType.h b/src/ripple/types/IdentifierType.h similarity index 100% rename from src/ripple/types/api/IdentifierType.h rename to src/ripple/types/IdentifierType.h diff --git a/src/ripple/types/api/Issue.h b/src/ripple/types/Issue.h similarity index 99% rename from src/ripple/types/api/Issue.h rename to src/ripple/types/Issue.h index a077c5fb77..dc99ec8596 100644 --- a/src/ripple/types/api/Issue.h +++ b/src/ripple/types/Issue.h @@ -24,7 +24,7 @@ #include #include -#include +#include namespace ripple { diff --git a/src/ripple/types/api/RandomNumbers.h b/src/ripple/types/RandomNumbers.h similarity index 100% rename from src/ripple/types/api/RandomNumbers.h rename to src/ripple/types/RandomNumbers.h diff --git a/src/ripple/types/api/RippleAccountID.h b/src/ripple/types/RippleAccountID.h similarity index 96% rename from src/ripple/types/api/RippleAccountID.h rename to src/ripple/types/RippleAccountID.h index 2f4e435d0d..c7261ac0e6 100644 --- a/src/ripple/types/api/RippleAccountID.h +++ b/src/ripple/types/RippleAccountID.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TYPES_RIPPLEACCOUNTID_H_INCLUDED #define RIPPLE_TYPES_RIPPLEACCOUNTID_H_INCLUDED -#include -#include +#include +#include #include diff --git a/src/ripple/types/api/RippleAccountPrivateKey.h b/src/ripple/types/RippleAccountPrivateKey.h similarity index 97% rename from src/ripple/types/api/RippleAccountPrivateKey.h rename to src/ripple/types/RippleAccountPrivateKey.h index 375fd1abed..68b64a1a32 100644 --- a/src/ripple/types/api/RippleAccountPrivateKey.h +++ b/src/ripple/types/RippleAccountPrivateKey.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RIPPLEACCOUNTPRIVATEKEY_H_INCLUDED #define RIPPLE_TYPES_RIPPLEACCOUNTPRIVATEKEY_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/types/api/RippleAccountPublicKey.h b/src/ripple/types/RippleAccountPublicKey.h similarity index 97% rename from src/ripple/types/api/RippleAccountPublicKey.h rename to src/ripple/types/RippleAccountPublicKey.h index 6408e4984c..8f69435a9d 100644 --- a/src/ripple/types/api/RippleAccountPublicKey.h +++ b/src/ripple/types/RippleAccountPublicKey.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RIPPLEACCOUNTPUBLICKEY_H_INCLUDED #define RIPPLE_TYPES_RIPPLEACCOUNTPUBLICKEY_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/types/api/RippleLedgerHash.h b/src/ripple/types/RippleLedgerHash.h similarity index 97% rename from src/ripple/types/api/RippleLedgerHash.h rename to src/ripple/types/RippleLedgerHash.h index 35dda2b5e5..ffb02b2b7a 100644 --- a/src/ripple/types/api/RippleLedgerHash.h +++ b/src/ripple/types/RippleLedgerHash.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RIPPLELEDGERHASH_H_INCLUDED #define RIPPLE_TYPES_RIPPLELEDGERHASH_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/types/api/RipplePrivateKey.h b/src/ripple/types/RipplePrivateKey.h similarity index 96% rename from src/ripple/types/api/RipplePrivateKey.h rename to src/ripple/types/RipplePrivateKey.h index 89f76abadd..5ae833e9f3 100644 --- a/src/ripple/types/api/RipplePrivateKey.h +++ b/src/ripple/types/RipplePrivateKey.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RIPPLEPRIVATEKEY_H_INCLUDED #define RIPPLE_TYPES_RIPPLEPRIVATEKEY_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/types/api/RipplePublicKey.h b/src/ripple/types/RipplePublicKey.h similarity index 94% rename from src/ripple/types/api/RipplePublicKey.h rename to src/ripple/types/RipplePublicKey.h index d49b3f0ce3..b27275714b 100644 --- a/src/ripple/types/api/RipplePublicKey.h +++ b/src/ripple/types/RipplePublicKey.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TYPES_RIPPLEPUBLICKEY_H_INCLUDED #define RIPPLE_TYPES_RIPPLEPUBLICKEY_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/types/api/RipplePublicKeyHash.h b/src/ripple/types/RipplePublicKeyHash.h similarity index 97% rename from src/ripple/types/api/RipplePublicKeyHash.h rename to src/ripple/types/RipplePublicKeyHash.h index 9671304b31..b858faeed2 100644 --- a/src/ripple/types/api/RipplePublicKeyHash.h +++ b/src/ripple/types/RipplePublicKeyHash.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RIPPLEPUBLICKEYHASH_H_INCLUDED #define RIPPLE_TYPES_RIPPLEPUBLICKEYHASH_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/types/api/SimpleIdentifier.h b/src/ripple/types/SimpleIdentifier.h similarity index 98% rename from src/ripple/types/api/SimpleIdentifier.h rename to src/ripple/types/SimpleIdentifier.h index f5243bd39e..e6b3c3d2ec 100644 --- a/src/ripple/types/api/SimpleIdentifier.h +++ b/src/ripple/types/SimpleIdentifier.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_SIMPLEIDENTIFIER_H_INCLUDED #define RIPPLE_TYPES_SIMPLEIDENTIFIER_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/types/TODO.md b/src/ripple/types/TODO.md deleted file mode 100644 index 0f837e073f..0000000000 --- a/src/ripple/types/TODO.md +++ /dev/null @@ -1,6 +0,0 @@ -# Types TODO - -- Replace uint128, uint160, uint256 with solid types - -- Clean up and optimize Base58 conversions - diff --git a/src/ripple/types/api/UInt160.h b/src/ripple/types/UInt160.h similarity index 96% rename from src/ripple/types/api/UInt160.h rename to src/ripple/types/UInt160.h index 9927808cbb..f32cdaa80c 100644 --- a/src/ripple/types/api/UInt160.h +++ b/src/ripple/types/UInt160.h @@ -25,8 +25,8 @@ #ifndef RIPPLE_TYPES_UINT160_H_INCLUDED #define RIPPLE_TYPES_UINT160_H_INCLUDED -#include -#include +#include +#include #include #include diff --git a/src/ripple/types/api/UintTypes.h b/src/ripple/types/UintTypes.h similarity index 98% rename from src/ripple/types/api/UintTypes.h rename to src/ripple/types/UintTypes.h index 5ebae72323..69fc5c9f31 100644 --- a/src/ripple/types/api/UintTypes.h +++ b/src/ripple/types/UintTypes.h @@ -21,7 +21,7 @@ #define RIPPLE_TYPES_BASICS #include -#include +#include namespace ripple { namespace detail { diff --git a/src/ripple/types/api/base_uint.h b/src/ripple/types/base_uint.h similarity index 99% rename from src/ripple/types/api/base_uint.h rename to src/ripple/types/base_uint.h index e0525ed774..5ad678228a 100644 --- a/src/ripple/types/api/base_uint.h +++ b/src/ripple/types/base_uint.h @@ -25,9 +25,9 @@ #ifndef RIPPLE_TYPES_BASE_UINT_H_INCLUDED #define RIPPLE_TYPES_BASE_UINT_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/types/impl/UintTypes.cpp b/src/ripple/types/impl/UintTypes.cpp index 25f5ba9a7f..c1c50df324 100644 --- a/src/ripple/types/impl/UintTypes.cpp +++ b/src/ripple/types/impl/UintTypes.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include +#include -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/types/api/strHex.h b/src/ripple/types/strHex.h similarity index 100% rename from src/ripple/types/api/strHex.h rename to src/ripple/types/strHex.h diff --git a/src/ripple/unity/app.cpp b/src/ripple/unity/app.cpp index f0139c1251..0b4a3f9b4e 100644 --- a/src/ripple/unity/app.cpp +++ b/src/ripple/unity/app.cpp @@ -28,20 +28,20 @@ #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/unity/app.h b/src/ripple/unity/app.h index 780ccc4f9e..7aae729f86 100644 --- a/src/ripple/unity/app.h +++ b/src/ripple/unity/app.h @@ -43,7 +43,7 @@ //------------------------------------------------------------------------------ -#include +#include #include #include @@ -58,66 +58,66 @@ #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 -#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 +#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 +#include +#include +#include +#include +#include + #include + #include +#include #endif diff --git a/src/ripple/unity/app1.cpp b/src/ripple/unity/app1.cpp index eaf1521275..326cb8909f 100644 --- a/src/ripple/unity/app1.cpp +++ b/src/ripple/unity/app1.cpp @@ -25,20 +25,20 @@ #include -#include +#include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include // requires Application -#include +#include -#include +#include -#include -#include -#include +#include +#include +#include diff --git a/src/ripple/unity/app2.cpp b/src/ripple/unity/app2.cpp index 2cec33282c..ccfb12d068 100644 --- a/src/ripple/unity/app2.cpp +++ b/src/ripple/unity/app2.cpp @@ -23,22 +23,22 @@ #include -#include // Uses theApp -#include -#include -#include +#include // Uses theApp +#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/unity/app3.cpp b/src/ripple/unity/app3.cpp index 69c14c7aa1..aa5a3b5f81 100644 --- a/src/ripple/unity/app3.cpp +++ b/src/ripple/unity/app3.cpp @@ -21,8 +21,8 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include diff --git a/src/ripple/unity/app4.cpp b/src/ripple/unity/app4.cpp index 316c7b4974..7ae2e53f19 100644 --- a/src/ripple/unity/app4.cpp +++ b/src/ripple/unity/app4.cpp @@ -27,16 +27,16 @@ #include // for UniqueNodeList.cpp -#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/unity/app5.cpp b/src/ripple/unity/app5.cpp index 72397df4da..de56ebd840 100644 --- a/src/ripple/unity/app5.cpp +++ b/src/ripple/unity/app5.cpp @@ -24,16 +24,15 @@ #include #include -#include #include #include #include -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include diff --git a/src/ripple/unity/app6.cpp b/src/ripple/unity/app6.cpp index 93731f2b0d..68ea6c89bf 100644 --- a/src/ripple/unity/app6.cpp +++ b/src/ripple/unity/app6.cpp @@ -23,11 +23,11 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple/unity/app7.cpp b/src/ripple/unity/app7.cpp index 9057ed5e3a..cab79fcdee 100644 --- a/src/ripple/unity/app7.cpp +++ b/src/ripple/unity/app7.cpp @@ -25,12 +25,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include diff --git a/src/ripple/unity/app8.cpp b/src/ripple/unity/app8.cpp index e258825b96..537b66c3c0 100644 --- a/src/ripple/unity/app8.cpp +++ b/src/ripple/unity/app8.cpp @@ -26,27 +26,27 @@ #pragma warning (disable: 4309) // truncation of constant value #endif -#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 #ifdef _MSC_VER #pragma warning (pop) diff --git a/src/ripple/unity/app9.cpp b/src/ripple/unity/app9.cpp index b5f6a39e4f..c522f9378a 100644 --- a/src/ripple/unity/app9.cpp +++ b/src/ripple/unity/app9.cpp @@ -21,22 +21,22 @@ #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/unity/basics.cpp b/src/ripple/unity/basics.cpp index 172bb9b441..b1e101e2c8 100644 --- a/src/ripple/unity/basics.cpp +++ b/src/ripple/unity/basics.cpp @@ -19,12 +19,12 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple/unity/basics.h b/src/ripple/unity/basics.h deleted file mode 100644 index 41d600e499..0000000000 --- a/src/ripple/unity/basics.h +++ /dev/null @@ -1,45 +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_BASICS_H_INCLUDED -#define RIPPLE_BASICS_H_INCLUDED - -#include - -#include - -#include -#include - -#include - -using beast::zero; -using beast::Zero; - -#include - -#include - -#include -#include -#include -#include -#include - -#endif diff --git a/src/ripple/unity/common.cpp b/src/ripple/unity/common.cpp index 6c0d1e0a32..eb2922cea6 100644 --- a/src/ripple/unity/common.cpp +++ b/src/ripple/unity/common.cpp @@ -20,7 +20,9 @@ #include #include -#include -#include #include +#include #include +#include + +#include diff --git a/src/ripple/unity/core.cpp b/src/ripple/unity/core.cpp index 3c14af9181..63650c1a1e 100644 --- a/src/ripple/unity/core.cpp +++ b/src/ripple/unity/core.cpp @@ -19,21 +19,9 @@ #include -#include -#include -#include - -#include -#include - -#include -#include // for HTTPClient - -#include -#include // private -#include -#include -#include - -#include -#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple/unity/data.cpp b/src/ripple/unity/data.cpp index 0857df2d37..94630227be 100644 --- a/src/ripple/unity/data.cpp +++ b/src/ripple/unity/data.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include #include // VFALCO TODO fix these warnings! @@ -55,32 +55,32 @@ #undef min #endif -#include +#include -#include // needs RippleAddress VFALCO TODO remove this dependency cycle -#include +#include // needs RippleAddress VFALCO TODO remove this dependency cycle +#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 +#include +#include +#include #if BEAST_MSVC #pragma warning (pop) diff --git a/src/ripple/unity/data.h b/src/ripple/unity/data.h index 3374646874..124e3acbe6 100644 --- a/src/ripple/unity/data.h +++ b/src/ripple/unity/data.h @@ -20,35 +20,35 @@ #ifndef RIPPLE_DATA_H_INCLUDED #define RIPPLE_DATA_H_INCLUDED -#include +#include #include -#include +#include struct bignum_st; typedef struct bignum_st BIGNUM; -#include -#include -#include -#include -#include -#include -#include -#include -#include // needs CKey -#include -#include // needs Serializer, TER -#include -#include -#include // needs SOTemplate from SerializedObjectTemplate -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // needs CKey +#include +#include // needs Serializer, TER +#include +#include +#include // needs SOTemplate from SerializedObjectTemplate +#include +#include +#include +#include -#include +#include -#include +#include //------------------------------------------------------------------------------ diff --git a/src/ripple/unity/net.cpp b/src/ripple/unity/net.cpp index b87351b311..0d56e04a17 100644 --- a/src/ripple/unity/net.cpp +++ b/src/ripple/unity/net.cpp @@ -28,35 +28,13 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include // for HTTPClient, RPCDoor - -// VFALCO NOTE This is the "new new new" where individual headers are included -// directly (instead of the module header). The corresponding .cpp -// still uses the unity style inclusion. -// -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include // Is this still needed? +#include +#include +#include +#include +#include diff --git a/src/ripple/unity/net.h b/src/ripple/unity/net.h index d79c27b413..5149a0b60e 100644 --- a/src/ripple/unity/net.h +++ b/src/ripple/unity/net.h @@ -20,27 +20,25 @@ #ifndef RIPPLE_NET_H_INCLUDED #define RIPPLE_NET_H_INCLUDED -#include #undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER #define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER /**/ #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 #endif diff --git a/src/ripple/unity/peerfinder.cpp b/src/ripple/unity/peerfinder.cpp index b12b204708..952862728f 100644 --- a/src/ripple/unity/peerfinder.cpp +++ b/src/ripple/unity/peerfinder.cpp @@ -19,49 +19,12 @@ #include -#include - -#include - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include -#include - -#include // VFALCO NOTE move to beast - #ifndef NDEBUG # define consistency_check(cond) bassert(cond) #else # define consistency_check(cond) #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include diff --git a/src/ripple/unity/peerfinder.h b/src/ripple/unity/peerfinder.h deleted file mode 100644 index 2a7e00cea2..0000000000 --- a/src/ripple/unity/peerfinder.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_PEERFINDER_H_INCLUDED -#define RIPPLE_PEERFINDER_H_INCLUDED - -#include - -#include - -#include -#include -#include -#include -#include -#include - -#endif diff --git a/src/ripple/unity/radmap.cpp b/src/ripple/unity/radmap.cpp deleted file mode 100644 index 0a76f040d9..0000000000 --- a/src/ripple/unity/radmap.cpp +++ /dev/null @@ -1,22 +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 diff --git a/src/ripple/unity/resource.cpp b/src/ripple/unity/resource.cpp index 014ea611fb..7ac494402c 100644 --- a/src/ripple/unity/resource.cpp +++ b/src/ripple/unity/resource.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/src/ripple/unity/rpcx.cpp b/src/ripple/unity/rpcx.cpp index 8706f8c4fb..920a96f196 100644 --- a/src/ripple/unity/rpcx.cpp +++ b/src/ripple/unity/rpcx.cpp @@ -28,83 +28,83 @@ #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 -#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 +#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 +#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 +#include diff --git a/src/ripple/unity/rpcx.h b/src/ripple/unity/rpcx.h index 2551c9e1fc..ddf8eb25fd 100644 --- a/src/ripple/unity/rpcx.h +++ b/src/ripple/unity/rpcx.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RPC_H_INCLUDED #define RIPPLE_RPC_H_INCLUDED -#include -#include -#include +#include +#include +#include #endif diff --git a/src/ripple/unity/sslutil.h b/src/ripple/unity/sslutil.h index fec7d60187..7881722e73 100644 --- a/src/ripple/unity/sslutil.h +++ b/src/ripple/unity/sslutil.h @@ -27,10 +27,10 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #endif diff --git a/src/ripple/unity/types.cpp b/src/ripple/unity/types.cpp index 2bc4033fe8..e9be606248 100644 --- a/src/ripple/unity/types.cpp +++ b/src/ripple/unity/types.cpp @@ -43,5 +43,3 @@ #include #include #include - -#include diff --git a/src/ripple/unity/types.h b/src/ripple/unity/types.h index 9548f2ca76..e2ab27b949 100644 --- a/src/ripple/unity/types.h +++ b/src/ripple/unity/types.h @@ -38,26 +38,26 @@ #include #endif -#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 +#include +#include #endif diff --git a/src/ripple/unity/websocket.cpp b/src/ripple/unity/websocket.cpp index 46f7dba8fe..ca4a94cef3 100644 --- a/src/ripple/unity/websocket.cpp +++ b/src/ripple/unity/websocket.cpp @@ -42,5 +42,5 @@ #include #include -#include -#include +#include +#include diff --git a/src/ripple/validators/Source.h b/src/ripple/validators/Source.h index ca93db0697..1692fae948 100644 --- a/src/ripple/validators/Source.h +++ b/src/ripple/validators/Source.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_VALIDATORS_SOURCE_H_INCLUDED #define RIPPLE_VALIDATORS_SOURCE_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/validators/Types.h b/src/ripple/validators/Types.h index a0a8fa7a9b..76004e242a 100644 --- a/src/ripple/validators/Types.h +++ b/src/ripple/validators/Types.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_VALIDATORS_TYPES_H_INCLUDED #define RIPPLE_VALIDATORS_TYPES_H_INCLUDED -#include +#include namespace ripple { namespace Validators { diff --git a/src/ripple/validators/impl/ChosenList.h b/src/ripple/validators/impl/ChosenList.h index c07dd441a6..fb4216db31 100644 --- a/src/ripple/validators/impl/ChosenList.h +++ b/src/ripple/validators/impl/ChosenList.h @@ -21,7 +21,7 @@ #define RIPPLE_VALIDATORS_CHOSENLIST_H_INCLUDED #include -#include +#include namespace ripple { namespace Validators { diff --git a/src/ripple/validators/tests/Validators.test.cpp b/src/ripple/validators/tests/Validators.test.cpp index 1021d0dfa0..50b9bfcb14 100644 --- a/src/ripple/validators/tests/Validators.test.cpp +++ b/src/ripple/validators/tests/Validators.test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/ripple/module/websocket/autosocket/AutoSocket.cpp b/src/ripple/websocket/autosocket/AutoSocket.cpp similarity index 100% rename from src/ripple/module/websocket/autosocket/AutoSocket.cpp rename to src/ripple/websocket/autosocket/AutoSocket.cpp diff --git a/src/ripple/module/websocket/autosocket/AutoSocket.h b/src/ripple/websocket/autosocket/AutoSocket.h similarity index 97% rename from src/ripple/module/websocket/autosocket/AutoSocket.h rename to src/ripple/websocket/autosocket/AutoSocket.h index d678aab3eb..eee9709472 100644 --- a/src/ripple/module/websocket/autosocket/AutoSocket.h +++ b/src/ripple/websocket/autosocket/AutoSocket.h @@ -17,11 +17,15 @@ */ //============================================================================== -#ifndef __AUTOSOCKET_H_ -#define __AUTOSOCKET_H_ +#ifndef RIPPLE_WEBSOCKET_AUTOSOCKET_H_INCLUDED +#define RIPPLE_WEBSOCKET_AUTOSOCKET_H_INCLUDED +#include #include #include +#include +#include +#include // Socket wrapper that supports both SSL and non-SSL connections. // Generally, handle it as you would an SSL connection. diff --git a/src/ripple/module/websocket/autosocket/LogWebsockets.cpp b/src/ripple/websocket/autosocket/LogWebsockets.cpp similarity index 100% rename from src/ripple/module/websocket/autosocket/LogWebsockets.cpp rename to src/ripple/websocket/autosocket/LogWebsockets.cpp diff --git a/test/freeze-test.coffee b/test/freeze-test.coffee index efd06b1c24..3e2a7cdfce 100644 --- a/test/freeze-test.coffee +++ b/test/freeze-test.coffee @@ -345,7 +345,7 @@ suite_setup = (state) -> ##################################### TESTS #################################### execute_if_enabled = (fn) -> - path = "#{__dirname}/../src/ripple/module/data/protocol/TxFlags.h" + path = "#{__dirname}/../src/ripple/data/protocol/TxFlags.h" skip_it = /asfGlobalFreeze/.exec(fs.readFileSync(path)) == null func = if skip_it then global.suite.skip else global.suite enforced = false