kernel: deduplicate BlockInfo declarations

Author: PastaPastaPasta

src/interfaces/chain.h

@@ -20,7 +20,6 @@
 
 class ArgsManager;
 class CBlock;
-class CBlockUndo;
 class CFeeRate;
 class CRPCCommand;
 class CScheduler;
@@ -90,22 +89,6 @@ class FoundBlock
     mutable bool found = false;
 };
 
-//! Block data sent with blockConnected, blockDisconnected notifications.
-struct BlockInfo {
-    const uint256& hash;
-    const uint256* prev_hash = nullptr;
-    int height = -1;
-    int file_number = -1;
-    unsigned data_pos = 0;
-    const CBlock* data = nullptr;
-    const CBlockUndo* undo_data = nullptr;
-    // The maximum time in the chain up to and including this block.
-    // A timestamp that can only move forward.
-    unsigned int chain_time_max{0};
-
-    BlockInfo(const uint256& hash LIFETIMEBOUND) : hash(hash) {}
-};
-
 //! Interface giving clients (wallet processes, maybe other analysis tools in
 //! the future) ability to access to the chain state, receive notifications,
 //! estimate fees, and submit transactions.

src/kernel/chain.h

@@ -5,37 +5,29 @@
 #ifndef BITCOIN_KERNEL_CHAIN_H
 #define BITCOIN_KERNEL_CHAIN_H
 
-#include<iostream>
-
-class CBlock;
-class CBlockIndex;
-namespace interfaces {
-struct BlockInfo;
-} // namespace interfaces
+#include <attributes.h>
 
-namespace kernel {
-//! Return data from block index.
-interfaces::BlockInfo MakeBlockInfo(const CBlockIndex* block_index, const CBlock* data = nullptr);
-
-} // namespace kernel
+#include<iostream>
 
 class CBlock;
 class CBlockIndex;
 class CBlockUndo;
 class uint256;
 namespace interfaces {
-//! Block data sent with blockConnected and blockDisconnected notifications.
+//! Block data sent with blockConnected, blockDisconnected notifications.
 struct BlockInfo {
     const uint256& hash;
-    const uint256* prev_hash{nullptr};
-    int height{-1};
-    int file_number{-1};
-    unsigned data_pos{0};
-    const CBlock* data{nullptr};
-    const CBlockUndo* undo_data{nullptr};
+    const uint256* prev_hash = nullptr;
+    int height = -1;
+    int file_number = -1;
+    unsigned data_pos = 0;
+    const CBlock* data = nullptr;
+    const CBlockUndo* undo_data = nullptr;
+    // The maximum time in the chain up to and including this block.
+    // A timestamp that can only move forward.
     unsigned int chain_time_max{0};
 
-    explicit BlockInfo(const uint256& block_hash) : hash(block_hash) {}
+    BlockInfo(const uint256& hash LIFETIMEBOUND) : hash(hash) {}
 };
 } // namespace interfaces