mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-02 09:46:52 -05:00
util: move error.h TransactionError enum to node/types.h
New node/types.h file is analagous to existing wallet/types.h and is a better place to define simple node types that are shared externally with wallet and gui code than the util library. Motivation for this change is to completely remove util/error.h file currently holding TransactionError in a followup commit.
This commit is contained in:
parent
9bcce2608d
commit
0d44c44ae3
4 changed files with 41 additions and 22 deletions
|
@ -234,6 +234,7 @@ BITCOIN_CORE_H = \
|
|||
node/timeoffsets.h \
|
||||
node/transaction.h \
|
||||
node/txreconciliation.h \
|
||||
node/types.h \
|
||||
node/utxo_snapshot.h \
|
||||
node/validation_cache_args.h \
|
||||
noui.h \
|
||||
|
|
33
src/node/types.h
Normal file
33
src/node/types.h
Normal file
|
@ -0,0 +1,33 @@
|
|||
// Copyright (c) 2010-2021 The Bitcoin Core developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
//! @file node/types.h is a home for public enum and struct type definitions
|
||||
//! that are used by internally by node code, but also used externally by wallet
|
||||
//! or GUI code.
|
||||
//!
|
||||
//! This file is intended to define only simple types that do not have external
|
||||
//! dependencies. More complicated types should be defined in dedicated header
|
||||
//! files.
|
||||
|
||||
#ifndef BITCOIN_NODE_TYPES_H
|
||||
#define BITCOIN_NODE_TYPES_H
|
||||
|
||||
enum class TransactionError {
|
||||
OK, //!< No error
|
||||
MISSING_INPUTS,
|
||||
ALREADY_IN_CHAIN,
|
||||
P2P_DISABLED,
|
||||
MEMPOOL_REJECTED,
|
||||
MEMPOOL_ERROR,
|
||||
INVALID_PSBT,
|
||||
PSBT_MISMATCH,
|
||||
SIGHASH_MISMATCH,
|
||||
MAX_FEE_EXCEEDED,
|
||||
MAX_BURN_EXCEEDED,
|
||||
EXTERNAL_SIGNER_NOT_FOUND,
|
||||
EXTERNAL_SIGNER_FAILED,
|
||||
INVALID_PACKAGE,
|
||||
};
|
||||
|
||||
#endif // BITCOIN_NODE_TYPES_H
|
|
@ -15,27 +15,11 @@
|
|||
* translating errors passed across wallet/node/rpc/gui code boundaries.
|
||||
*/
|
||||
|
||||
#include <node/types.h>
|
||||
#include <string>
|
||||
|
||||
struct bilingual_str;
|
||||
|
||||
enum class TransactionError {
|
||||
OK, //!< No error
|
||||
MISSING_INPUTS,
|
||||
ALREADY_IN_CHAIN,
|
||||
P2P_DISABLED,
|
||||
MEMPOOL_REJECTED,
|
||||
MEMPOOL_ERROR,
|
||||
INVALID_PSBT,
|
||||
PSBT_MISMATCH,
|
||||
SIGHASH_MISMATCH,
|
||||
MAX_FEE_EXCEEDED,
|
||||
MAX_BURN_EXCEEDED,
|
||||
EXTERNAL_SIGNER_NOT_FOUND,
|
||||
EXTERNAL_SIGNER_FAILED,
|
||||
INVALID_PACKAGE,
|
||||
};
|
||||
|
||||
bilingual_str TransactionErrorString(const TransactionError error);
|
||||
|
||||
bilingual_str ResolveErrMsg(const std::string& optname, const std::string& strBind);
|
||||
|
|
|
@ -3,12 +3,13 @@
|
|||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
//! @file Public type definitions that are used inside and outside of the wallet
|
||||
//! (e.g. by src/wallet and src/interfaces and src/qt code).
|
||||
//! @file wallet/types.h is a home for public enum and struct type definitions
|
||||
//! that are used by internally by wallet code, but also used externally by node
|
||||
//! or GUI code.
|
||||
//!
|
||||
//! File is home for simple enum and struct definitions that don't deserve
|
||||
//! separate header files. More complicated wallet public types like
|
||||
//! CCoinControl that are used externally can have separate headers.
|
||||
//! This file is intended to define only simple types that do not have external
|
||||
//! dependencies. More complicated public wallet types like CCoinControl should
|
||||
//! be defined in dedicated header files.
|
||||
|
||||
#ifndef BITCOIN_WALLET_TYPES_H
|
||||
#define BITCOIN_WALLET_TYPES_H
|
||||
|
|
Loading…
Add table
Reference in a new issue