Browse Source

MOVEONLY: CBlockUndo from main.h to undo.h

pull/1/head
jtimon 8 years ago committed by jtimon
parent
commit
937ba572d0
  1. 1
      src/main.cpp
  2. 16
      src/main.h
  3. 14
      src/undo.h

1
src/main.cpp

@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
#include "txdb.h"
#include "txmempool.h"
#include "ui_interface.h"
#include "undo.h"
#include "util.h"
#include "utilmoneystr.h"

16
src/main.h

@ -25,7 +25,6 @@ @@ -25,7 +25,6 @@
#include "tinyformat.h"
#include "txmempool.h"
#include "uint256.h"
#include "undo.h"
#include <algorithm>
#include <exception>
@ -302,21 +301,6 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason); @@ -302,21 +301,6 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason);
bool IsFinalTx(const CTransaction &tx, int nBlockHeight = 0, int64_t nBlockTime = 0);
/** Undo information for a CBlock */
class CBlockUndo
{
public:
std::vector<CTxUndo> vtxundo; // for all but the coinbase
ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
READWRITE(vtxundo);
}
};
/**
* Closure representing one script verification
* Note that this stores references to the spending transaction

14
src/undo.h

@ -68,4 +68,18 @@ public: @@ -68,4 +68,18 @@ public:
}
};
/** Undo information for a CBlock */
class CBlockUndo
{
public:
std::vector<CTxUndo> vtxundo; // for all but the coinbase
ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
READWRITE(vtxundo);
}
};
#endif // BITCOIN_UNDO_H

Loading…
Cancel
Save