LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #5648

Browse source 
2ce63d3 MOVEONLY: Move struct CBlockTemplate to miner.h (from main.h) (Luke Dashjr)
This commit is contained in:
Wladimir J. van der Laan 2015-01-20 17:34:30 +01:00
commit 7810a0a1e6
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main.h
View file

@ -45,7 +45,6 @@ class CScriptCheck;
class CValidationInterface; class CValidationInterface;
class CValidationState; class CValidationState;
struct CBlockTemplate;
struct CNodeStateStats; struct CNodeStateStats;
/** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/ /** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/
@ -513,17 +512,6 @@ extern CCoinsViewCache *pcoinsTip;
/** Global variable that points to the active block tree (protected by cs_main) */ /** Global variable that points to the active block tree (protected by cs_main) */
extern CBlockTreeDB *pblocktree; extern CBlockTreeDB *pblocktree;
struct CBlockTemplate
{
CBlock block;
std::vector<CAmount> vTxFees;
std::vector<int64_t> vTxSigOps;
};
class CValidationInterface { class CValidationInterface {
protected: protected:

1
src/miner.cpp
View file

@ -6,7 +6,6 @@
#include "miner.h" #include "miner.h"
#include "amount.h" #include "amount.h"
#include "primitives/block.h"
#include "primitives/transaction.h" #include "primitives/transaction.h"
#include "hash.h" #include "hash.h"
#include "main.h" #include "main.h"

11
src/miner.h
View file

@ -6,16 +6,21 @@
#ifndef BITCOIN_MINER_H #ifndef BITCOIN_MINER_H
#define BITCOIN_MINER_H #define BITCOIN_MINER_H
#include "primitives/block.h"
#include <stdint.h> #include <stdint.h>
class CBlock;
class CBlockHeader;
class CBlockIndex; class CBlockIndex;
class CReserveKey; class CReserveKey;
class CScript; class CScript;
class CWallet; class CWallet;
struct CBlockTemplate; struct CBlockTemplate
{
CBlock block;
std::vector<CAmount> vTxFees;
std::vector<int64_t> vTxSigOps;
};
/** Run the miner threads */ /** Run the miner threads */
void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads); void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads);