Ver código fonte

minor style cleanups

tags/v0.15.1
Philip Kaufmann 7 anos atrás
pai
commit
2b45345aac
3 arquivos alterados com 11 adições e 11 exclusões
  1. 9
    9
      src/main.cpp
  2. 1
    0
      src/main.h
  3. 1
    2
      src/test/checkblock_tests.cpp

+ 9
- 9
src/main.cpp Ver arquivo

@@ -1823,7 +1823,7 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
return state.DoS(100,
error("ConnectBlock() : coinbase pays too much (actual=%d vs limit=%d)",
block.vtx[0].GetValueOut(), GetBlockValue(pindex->nHeight, nFees)),
REJECT_INVALID, "bad-cb-amount");
REJECT_INVALID, "bad-cb-amount");

if (!control.Wait())
return state.DoS(100, false);
@@ -3244,14 +3244,14 @@ void static ProcessGetData(CNode* pfrom)
int nHeight = mi->second->nHeight;
CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(mapBlockIndex);
if (pcheckpoint && nHeight < pcheckpoint->nHeight) {
if (!chainActive.Contains(mi->second))
{
LogPrintf("ProcessGetData(): ignoring request for old block that isn't in the main chain\n");
} else {
send = true;
}
if (!chainActive.Contains(mi->second))
{
LogPrintf("ProcessGetData(): ignoring request for old block that isn't in the main chain\n");
} else {
send = true;
}
} else {
send = true;
send = true;
}
}
if (send)
@@ -3759,7 +3759,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
}
int nDoS = 0;
if (state.IsInvalid(nDoS))
{
{
LogPrint("mempool", "%s from %s %s was not accepted into the memory pool: %s\n", tx.GetHash().ToString(),
pfrom->addr.ToString(), pfrom->cleanSubVer,
state.GetRejectReason());

+ 1
- 0
src/main.h Ver arquivo

@@ -427,6 +427,7 @@ class CMerkleTx : public CTransaction
{
private:
int GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const;

public:
uint256 hashBlock;
std::vector<uint256> vMerkleBranch;

+ 1
- 2
src/test/checkblock_tests.cpp Ver arquivo

@@ -15,8 +15,7 @@

BOOST_AUTO_TEST_SUITE(CheckBlock_tests)

bool
read_block(const std::string& filename, CBlock& block)
bool read_block(const std::string& filename, CBlock& block)
{
namespace fs = boost::filesystem;
fs::path testFile = fs::current_path() / "data" / filename;

Carregando…
Cancelar
Salvar