refactor: set ignore_incoming_txs in ApplyArgsManOptions

stickies-v · stickies-v · commit 5f41afcc4691 · 2023-07-25T14:34:06.000+01:00
Refactor to consistently use ApplyArgsManOptions to set all PeerManager::Options,
including ignore_incoming_txs.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1540,9 +1540,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     ChainstateManager& chainman = *Assert(node.chainman);
 
 
-    PeerManager::Options peerman_opts{
-        .ignore_incoming_txs = ignores_incoming_txs,
-    };
+    PeerManager::Options peerman_opts{};
     ApplyArgsManOptions(args, peerman_opts);
 
     assert(!node.peerman);
diff --git a/src/node/peerman_args.cpp b/src/node/peerman_args.cpp
@@ -18,6 +18,8 @@ void ApplyArgsManOptions(const ArgsManager& argsman, PeerManager::Options& optio
     }
 
     if (auto value{argsman.GetBoolArg("-capturemessages")}) options.capture_messages = *value;
+
+    if (auto value{argsman.GetBoolArg("-blocksonly")}) options.ignore_incoming_txs = *value;
 }
 
 } // namespace node

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ void ApplyArgsManOptions(const ArgsManager& argsman, PeerManager::Options& optio`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`if (auto value{argsman.GetBoolArg("-capturemessages")}) options.capture_messages = *value;`
	`21`	`+`
	`22`	`+ if (auto value{argsman.GetBoolArg("-blocksonly")}) options.ignore_incoming_txs = *value;`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`} // namespace node`