Merge bitcoin/bitcoin#33116: refactor: Convert uint256 to Txid
de0675f9derefactor: Move `transaction_identifier.h` to primitives (marcofleon)6f068f65deRemove implicit uint256 conversion and comparison (marcofleon)9c24cda72erefactor: Convert remaining instances from uint256 to Txid (marcofleon)d2ecd6815dpolicy, refactor: Convert uint256 to Txid (marcofleon)f6c0d1d231mempool, refactor: Convert uint256 to Txid (marcofleon)aeb0f78330refactor: Convert `mini_miner` from uint256 to Txid (marcofleon)326f244724refactor: Convert RPCs and `merkleblock` from uint256 to Txid (marcofleon)49b3d3a92aClean up `FindTxForGetData` (marcofleon) Pull request description: This is the final leg of the [type safety refactor](https://github.com/bitcoin/bitcoin/pull/32189). All of these changes are straightforward `uint256` --> `Txid` along with any necessary explicit conversions. Also, `transaction_identifier.h` is moved to primitives in the last commit, as `Txid` and `Wtxid` become fundamental types after this PR. ACKs for top commit: stickies-v: re-ACKde0675f9de, no changes since a20724d926d5844168c6a13fa8293df8c8927efe except address review nits. janb84: re ACKde0675f9dedergoegge: re-ACKde0675f9detheStack: Code-review ACKde0675f9deTree-SHA512: 2413160fca7ab146a8d79d18ce3afcf7384cacc73c513d41928904aa453b4dd7a350064cee71e9c5d015da5904c7c81ac17603e50a47441ebc5b0c653235dd08
This commit is contained in:
75 files changed
+323
-305
No files matched your search
@@ -5,9 +5,9 @@
|
||||
#ifndef BITCOIN_QT_SENDCOINSDIALOG_H
|
||||
#define BITCOIN_QT_SENDCOINSDIALOG_H
|
||||
|
||||
#include <primitives/transaction_identifier.h>
|
||||
#include <qt/clientmodel.h>
|
||||
#include <qt/walletmodel.h>
|
||||
#include <util/transaction_identifier.h>
|
||||
|
||||
#include <QDialog>
|
||||
#include <QMessageBox>
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
#define BITCOIN_QT_TRANSACTIONRECORD_H
|
||||
|
||||
#include <consensus/amount.h>
|
||||
#include <primitives/transaction_identifier.h>
|
||||
#include <uint256.h>
|
||||
#include <util/transaction_identifier.h>
|
||||
|
||||
#include <QList>
|
||||
#include <QString>
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
|
||||
#include <qt/guiutil.h>
|
||||
|
||||
#include <primitives/transaction_identifier.h>
|
||||
#include <uint256.h>
|
||||
#include <util/transaction_identifier.h>
|
||||
|
||||
#include <QWidget>
|
||||
#include <QKeyEvent>
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
#include <qt/walletmodeltransaction.h>
|
||||
|
||||
#include <interfaces/wallet.h>
|
||||
#include <primitives/transaction_identifier.h>
|
||||
#include <support/allocators/secure.h>
|
||||
#include <util/transaction_identifier.h>
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
||||
Reference in new issue
Block a user