Modularise the NetworkOPs interface #6225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

a1q123456 wants to merge 7 commits into a1q123456/modularise-relational-db from a1q123456/modularise-networkops-interface

.github/scripts/levelization/results/loops.txt

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ Loop: xrpld.app xrpld.core @@
       xrpld.app > xrpld.core
     Loop: xrpld.app xrpld.overlay
-      xrpld.overlay > xrpld.app
+      xrpld.overlay ~= xrpld.app
     Loop: xrpld.app xrpld.peerfinder
       xrpld.peerfinder == xrpld.app
@@ Expand Down @@

.github/scripts/levelization/results/ordering.txt

-Original file line number
+Diff line change
@@ Expand Up / @@ -136,6 +136,7 @@ test.rpc > xrpld.rpc @@
     test.rpc > xrpl.json
     test.rpc > xrpl.protocol
     test.rpc > xrpl.resource
+    test.rpc > xrpl.server
     test.server > test.jtx
     test.server > test.toplevel
     test.server > test.unit_test
@@ Expand Down Expand Up / @@ -177,8 +178,11 @@ xrpl.resource > xrpl.protocol @@
     xrpl.server > xrpl.basics
     xrpl.server > xrpl.core
     xrpl.server > xrpl.json
+    xrpl.server > xrpl.ledger
     xrpl.server > xrpl.protocol
     xrpl.server > xrpl.rdb
+    xrpl.server > xrpl.resource
+    xrpl.server > xrpl.shamap
     xrpl.shamap > xrpl.basics
     xrpl.shamap > xrpl.nodestore
     xrpl.shamap > xrpl.protocol
@@ Expand Down @@

cmake/XrplCore.cmake

-Original file line number
+Diff line change
@@ Expand Up / @@ -140,6 +140,7 @@ target_link_libraries(xrpl.libxrpl.server PUBLIC @@
       xrpl.libxrpl.protocol
       xrpl.libxrpl.core
       xrpl.libxrpl.rdb
+      xrpl.libxrpl.resource
     )
     add_module(xrpl ledger)
@@ Expand Down @@

src/xrpld/rpc/InfoSub.h → include/xrpl/server/InfoSub.h

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,5 +1,5 @@
  
    #ifndef XRPL_NET_INFOSUB_H_INCLUDED

    #define XRPL_NET_INFOSUB_H_INCLUDED

    #ifndef XRPL_SERVER_INFOSUB_H_INCLUDED

    #define XRPL_SERVER_INFOSUB_H_INCLUDED

    #include <xrpl/basics/CountedObject.h>

    #include <xrpl/json/json_value.h>

    @@ -147,6 +147,7 @@ class InfoSub : public CountedObject<InfoSub>
  
            virtual bool

            subPeerStatus(ref ispListener) = 0;

            virtual bool

            unsubPeerStatus(std::uint64_t uListener) = 0;

            virtual void

src/xrpld/app/misc/NetworkOPs.h → include/xrpl/server/NetworkOPs.h

-Original file line number
+Diff line change
@@ -1,14 +1,14 @@
-    #ifndef XRPL_APP_MISC_NETWORKOPS_H_INCLUDED
-    #define XRPL_APP_MISC_NETWORKOPS_H_INCLUDED
-    #include <xrpld/app/consensus/RCLCxPeerPos.h>
-    #include <xrpld/app/ledger/Ledger.h>
-    #include <xrpld/rpc/InfoSub.h>
+    #ifndef XRPL_SERVER_NETWORKOPS_H_INCLUDED
+    #define XRPL_SERVER_NETWORKOPS_H_INCLUDED
     #include <xrpl/core/JobQueue.h>
+    #include <xrpl/core/ServiceRegistry.h>
     #include <xrpl/ledger/ReadView.h>
     #include <xrpl/protocol/STValidation.h>
+    #include <xrpl/protocol/TER.h>
     #include <xrpl/protocol/messages.h>
+    #include <xrpl/server/InfoSub.h>
+    #include <xrpl/shamap/SHAMap.h>
     #include <boost/asio.hpp>
@@ Expand All / @@ -24,6 +24,7 @@ class LedgerMaster; @@
     class Transaction;
     class ValidatorKeys;
     class CanonicalTXSet;
+    class RCLCxPeerPos;
     // This is the primary interface into the "client" portion of the program.
     // Code that wants to do normal operations on the network such as
@@ Expand Down Expand Up / @@ -259,22 +260,6 @@ class NetworkOPs : public InfoSub::Source @@
         stateAccounting(Json::Value& obj) = 0;
     };
-    //------------------------------------------------------------------------------
-    std::unique_ptr<NetworkOPs>
-    make_NetworkOPs(
-        Application& app,
-        NetworkOPs::clock_type& clock,
-        bool standalone,
-        std::size_t minPeerCount,
-        bool start_valid,
-        JobQueue& job_queue,
-        LedgerMaster& ledgerMaster,
-        ValidatorKeys const& validatorKeys,
-        boost::asio::io_context& io_svc,
-        beast::Journal journal,
-        beast::insight::Collector::ptr const& collector);
     }  // namespace xrpl
     #endif

src/xrpld/rpc/detail/InfoSub.cpp → src/libxrpl/server/InfoSub.cpp

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    #include <xrpld/rpc/InfoSub.h>
+    #include <xrpl/server/InfoSub.h>
     namespace xrpl {
@@ Expand Down @@

src/test/app/Batch_test.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     #include <test/jtx/utility.h>
     #include <xrpld/app/misc/HashRouter.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/app/misc/Transaction.h>
     #include <xrpld/app/tx/apply.h>
     #include <xrpld/app/tx/detail/Batch.h>
@@ Expand All / @@ -14,6 +13,7 @@ @@
     #include <xrpl/protocol/Sign.h>
     #include <xrpl/protocol/TxFlags.h>
     #include <xrpl/protocol/jss.h>
+    #include <xrpl/server/NetworkOPs.h>
     namespace xrpl {
     namespace test {
@@ Expand Down @@

src/test/jtx/Env_test.cpp

-Original file line number
+Diff line change
@@ -1,13 +1,13 @@
     #include <test/jtx.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/app/misc/TxQ.h>
     #include <xrpl/beast/hash/uhash.h>
     #include <xrpl/beast/unit_test.h>
     #include <xrpl/protocol/Feature.h>
     #include <xrpl/protocol/TxFlags.h>
     #include <xrpl/protocol/jss.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <boost/lexical_cast.hpp>
@@ Expand Down @@

src/test/jtx/impl/Env.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ @@
     #include <test/jtx/utility.h>
     #include <xrpld/app/ledger/LedgerMaster.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/rpc/RPCCall.h>
     #include <xrpl/basics/Slice.h>
@@ Expand All / @@ -25,6 +24,7 @@ @@
     #include <xrpl/protocol/TxFlags.h>
     #include <xrpl/protocol/UintTypes.h>
     #include <xrpl/protocol/jss.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <memory>
@@ Expand Down @@

src/test/rpc/AmendmentBlocked_test.cpp

-Original file line number
+Diff line change
@@ -1,10 +1,10 @@
     #include <test/jtx.h>
     #include <test/jtx/WSClient.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/core/ConfigSections.h>
     #include <xrpl/protocol/jss.h>
+    #include <xrpl/server/NetworkOPs.h>
     namespace xrpl {
@@ Expand Down @@

src/test/rpc/ServerInfo_test.cpp

-Original file line number
+Diff line change
@@ -1,10 +1,10 @@
     #include <test/jtx.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/core/ConfigSections.h>
     #include <xrpl/beast/unit_test.h>
     #include <xrpl/protocol/jss.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <boost/format.hpp>
@@ Expand Down @@

src/test/rpc/Subscribe_test.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,13 +4,13 @@ @@
     #include <xrpld/app/main/LoadManager.h>
     #include <xrpld/app/misc/LoadFeeTrack.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/core/ConfigSections.h>
     #include <xrpl/beast/unit_test.h>
     #include <xrpl/json/json_value.h>
     #include <xrpl/protocol/Feature.h>
     #include <xrpl/protocol/jss.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <tuple>
@@ Expand Down @@

src/test/server/ServerStatus_test.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,12 +5,12 @@ @@
     #include <xrpld/app/ledger/LedgerMaster.h>
     #include <xrpld/app/misc/LoadFeeTrack.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/rpc/ServerHandler.h>
     #include <xrpl/basics/base64.h>
     #include <xrpl/beast/test/yield_to.h>
     #include <xrpl/json/json_reader.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <boost/algorithm/string/predicate.hpp>
     #include <boost/asio.hpp>
@@ Expand Down @@

src/xrpld/app/consensus/RCLConsensus.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ @@
     #include <xrpld/app/misc/HashRouter.h>
     #include <xrpld/app/misc/LoadFeeTrack.h>
     #include <xrpld/app/misc/NegativeUNLVote.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/app/misc/TxQ.h>
     #include <xrpld/app/misc/ValidatorKeys.h>
     #include <xrpld/app/misc/ValidatorList.h>
@@ Expand All / @@ -25,6 +24,7 @@ @@
     #include <xrpl/protocol/BuildInfo.h>
     #include <xrpl/protocol/Feature.h>
     #include <xrpl/protocol/digest.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <algorithm>
     #include <iomanip>
@@ Expand Down @@

src/xrpld/app/ledger/BookListeners.h

-Original file line number
+Diff line change
@@ -1,9 +1,8 @@
     #ifndef XRPL_APP_LEDGER_BOOKLISTENERS_H_INCLUDED
     #define XRPL_APP_LEDGER_BOOKLISTENERS_H_INCLUDED
-    #include <xrpld/rpc/InfoSub.h>
     #include <xrpl/protocol/MultiApiJson.h>
+    #include <xrpl/server/InfoSub.h>
     #include <memory>
     #include <mutex>
@@ Expand Down @@

src/xrpld/app/ledger/ConsensusTransSetSF.cpp

-Original file line number
+Diff line change
@@ -1,13 +1,13 @@
     #include <xrpld/app/ledger/ConsensusTransSetSF.h>
     #include <xrpld/app/ledger/TransactionMaster.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/app/misc/Transaction.h>
     #include <xrpl/basics/Log.h>
     #include <xrpl/core/JobQueue.h>
     #include <xrpl/nodestore/Database.h>
     #include <xrpl/protocol/HashPrefix.h>
     #include <xrpl/protocol/digest.h>
+    #include <xrpl/server/NetworkOPs.h>
     namespace xrpl {
@@ Expand Down @@

src/xrpld/app/ledger/OrderBookDB.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,12 +2,12 @@ @@
     #include <xrpld/app/ledger/OrderBookDB.h>
     #include <xrpld/app/main/Application.h>
     #include <xrpld/app/misc/AMMUtils.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/core/Config.h>
     #include <xrpl/basics/Log.h>
     #include <xrpl/core/JobQueue.h>
     #include <xrpl/protocol/Indexes.h>
+    #include <xrpl/server/NetworkOPs.h>
     namespace xrpl {
@@ Expand Down @@

src/xrpld/app/ledger/detail/InboundLedgers.cpp

-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     #include <xrpld/app/ledger/InboundLedgers.h>
     #include <xrpld/app/ledger/LedgerMaster.h>
     #include <xrpld/app/main/Application.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpl/basics/DecayingSample.h>
     #include <xrpl/basics/Log.h>
@@ Expand All / @@ -10,6 +9,7 @@ @@
     #include <xrpl/core/JobQueue.h>
     #include <xrpl/core/PerfLog.h>
     #include <xrpl/protocol/jss.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <exception>
     #include <memory>
@@ Expand Down @@

src/xrpld/app/ledger/detail/InboundTransactions.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,12 +2,12 @@ @@
     #include <xrpld/app/ledger/InboundTransactions.h>
     #include <xrpld/app/ledger/detail/TransactionAcquire.h>
     #include <xrpld/app/main/Application.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpl/basics/Log.h>
     #include <xrpl/core/JobQueue.h>
     #include <xrpl/protocol/RippleLedgerHash.h>
     #include <xrpl/resource/Fees.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <memory>
     #include <mutex>
@@ Expand Down @@

src/xrpld/app/ledger/detail/LedgerMaster.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
     #include <xrpld/app/main/Application.h>
     #include <xrpld/app/misc/AmendmentTable.h>
     #include <xrpld/app/misc/LoadFeeTrack.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/app/misc/SHAMapStore.h>
     #include <xrpld/app/misc/Transaction.h>
     #include <xrpld/app/misc/TxQ.h>
@@ Expand All / @@ -30,6 +29,7 @@ @@
     #include <xrpl/protocol/digest.h>
     #include <xrpl/rdb/RelationalDatabase.h>
     #include <xrpl/resource/Fees.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <algorithm>
     #include <chrono>
@@ Expand Down @@

src/xrpld/app/ledger/detail/TransactionAcquire.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,8 @@ @@
     #include <xrpld/app/ledger/InboundTransactions.h>
     #include <xrpld/app/ledger/detail/TransactionAcquire.h>
     #include <xrpld/app/main/Application.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <memory>
@@ Expand Down @@

src/xrpld/app/main/Application.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,11 +18,11 @@ @@
     #include <xrpld/app/misc/AmendmentTable.h>
     #include <xrpld/app/misc/HashRouter.h>
     #include <xrpld/app/misc/LoadFeeTrack.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpld/app/misc/SHAMapStore.h>
     #include <xrpld/app/misc/TxQ.h>
     #include <xrpld/app/misc/ValidatorKeys.h>
     #include <xrpld/app/misc/ValidatorSite.h>
+    #include <xrpld/app/misc/make_NetworkOPs.h>
     #include <xrpld/app/paths/PathRequests.h>
     #include <xrpld/app/rdb/backend/SQLiteDatabase.h>
     #include <xrpld/app/tx/apply.h>
@@ Expand Down Expand Up / @@ -383,7 +383,7 @@ class ApplicationImp : public Application, public BasicApp @@
                   logs_->journal("TaggedCache"))
             , m_networkOPs(make_NetworkOPs(
-                  *this,
+                  getServiceRegistry(),
                   stopwatch(),
                   config_->standalone(),
                   config_->NETWORK_QUORUM,
@@ Expand Down @@

src/xrpld/app/main/GRPCServer.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,13 +4,13 @@ @@
     #include <xrpld/app/main/Application.h>
     #include <xrpld/rpc/Context.h>
     #include <xrpld/rpc/GRPCHandlers.h>
-    #include <xrpld/rpc/InfoSub.h>
     #include <xrpld/rpc/Role.h>
     #include <xrpld/rpc/detail/Handler.h>
     #include <xrpl/core/JobQueue.h>
     #include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
     #include <xrpl/resource/Charge.h>
+    #include <xrpl/server/InfoSub.h>
     #include <grpcpp/grpcpp.h>
@@ Expand Down @@

src/xrpld/app/main/LoadManager.cpp

-Original file line number
+Diff line change
@@ -1,10 +1,10 @@
     #include <xrpld/app/main/Application.h>
     #include <xrpld/app/main/LoadManager.h>
     #include <xrpld/app/misc/LoadFeeTrack.h>
-    #include <xrpld/app/misc/NetworkOPs.h>
     #include <xrpl/beast/core/CurrentThreadName.h>
     #include <xrpl/json/to_string.h>
+    #include <xrpl/server/NetworkOPs.h>
     #include <memory>
     #include <mutex>
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modularise the NetworkOPs interface #6225

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Modularise the NetworkOPs interface #6225

Are you sure you want to change the base?

Uh oh!

Modularise the NetworkOPs interface #6225

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!