diff options
| author | Matt Corallo <git@bluematt.me> | 2016-09-30 18:38:05 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2016-10-04 13:51:32 -0400 |
| commit | f5efa283931ce1d52c59234b58988a221d42ecb4 (patch) | |
| tree | ce892a16f3048f3a378c8a71092bf4f9be557356 /src/main.h | |
| parent | fef1010199b70026fd6d56ebac5c277552757307 (diff) | |
| download | bitcoin-f5efa283931ce1d52c59234b58988a221d42ecb4.tar.xz | |
Remove CConnman parameter from ProcessNewBlock/ActivateBestChain
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index bb5e26b0b2..77179b25b9 100644 --- a/src/main.h +++ b/src/main.h @@ -218,7 +218,7 @@ static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024; * @param[out] dbp The already known disk position of pblock, or NULL if not yet stored. * @return True if state.IsValid() */ -bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, CConnman* connman); +bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp); /** Check whether enough disk space is available for an incoming block */ bool CheckDiskSpace(uint64_t nAdditionalBytes = 0); /** Open a block file (blk?????.dat) */ @@ -250,7 +250,7 @@ std::string GetWarnings(const std::string& strFor); /** Retrieve a transaction (from memory pool, or from disk, if possible) */ bool GetTransaction(const uint256 &hash, CTransaction &tx, const Consensus::Params& params, uint256 &hashBlock, bool fAllowSlow = false); /** Find the best known block, and make it the tip of the block chain */ -bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock = NULL, CConnman* connman = NULL); +bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock = NULL); CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams); /** |