Merge pull request #5096

e8ea0fd MOVEONLY: CInPoint from core to txmempool (jtimon)
This commit is contained in:
Pieter Wuille 2014-10-16 18:52:39 -07:00
commit c2fc9729d1
No known key found for this signature in database
GPG Key ID: 57896D2FF8F0B657
2 changed files with 13 additions and 13 deletions

View File

@ -61,19 +61,6 @@ public:
std::string ToString() const;
};
/** An inpoint - a combination of a transaction and an index n into its vin */
class CInPoint
{
public:
const CTransaction* ptx;
uint32_t n;
CInPoint() { SetNull(); }
CInPoint(const CTransaction* ptxIn, uint32_t nIn) { ptx = ptxIn; n = nIn; }
void SetNull() { ptx = NULL; n = (uint32_t) -1; }
bool IsNull() const { return (ptx == NULL && n == (uint32_t) -1); }
};
/** An input of a transaction. It contains the location of the previous
* transaction's output that it claims and a signature that matches the
* output's public key.

View File

@ -52,6 +52,19 @@ public:
class CMinerPolicyEstimator;
/** An inpoint - a combination of a transaction and an index n into its vin */
class CInPoint
{
public:
const CTransaction* ptx;
uint32_t n;
CInPoint() { SetNull(); }
CInPoint(const CTransaction* ptxIn, uint32_t nIn) { ptx = ptxIn; n = nIn; }
void SetNull() { ptx = NULL; n = (uint32_t) -1; }
bool IsNull() const { return (ptx == NULL && n == (uint32_t) -1); }
};
/*
* CTxMemPool stores valid-according-to-the-current-best-chain
* transactions that may be included in the next block.