neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge #10029: Fix parameter naming inconsistencies between .h and .cpp files

Browse Source 
97b8213 Fix parameter naming inconsistencies between .h and .cpp files (practicalswift)

Tree-SHA512: 4f46cc3973a898d2478bdb1b8c8d1829c3a7298b63bc47359c5dc2f135466773072d9672134ef3e7557dfc913720e49b675176b9e435b8bd1992af9ad53866e4
This commit is contained in:
Jonas Schnelli 2017-03-23 08:16:14 +01:00 committed by Pasta
parent 7edb9e15ac
commit 2aa3f890d1
No known key found for this signature in database
GPG Key ID: 0B8EB7A31A44D9C6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/server.h
View File

@ -66,7 +66,7 @@ void SetRPCWarmupStatus(const std::string& newStatus);
void SetRPCWarmupFinished(); void SetRPCWarmupFinished();
/* returns the current warmup state. */ /* returns the current warmup state. */
bool RPCIsInWarmup(std::string *statusOut); bool RPCIsInWarmup(std::string *outStatus);
/** /**
* Type-check arguments; throws JSONRPCError if wrong type given. Does not check that * Type-check arguments; throws JSONRPCError if wrong type given. Does not check that

2
src/txmempool.cpp
View File

@ -111,7 +111,7 @@ void CTxMemPool::UpdateForDescendants(txiter updateIt, cacheMap &cachedDescendan
// vHashesToUpdate is the set of transaction hashes from a disconnected block // vHashesToUpdate is the set of transaction hashes from a disconnected block
// which has been re-added to the mempool. // which has been re-added to the mempool.
// for each entry, look for descendants that are outside hashesToUpdate, and // for each entry, look for descendants that are outside vHashesToUpdate, and
// add fee/size information for such descendants to the parent. // add fee/size information for such descendants to the parent.
// for each such descendant, also update the ancestor state to include the parent. // for each such descendant, also update the ancestor state to include the parent.
void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256> &vHashesToUpdate) void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256> &vHashesToUpdate)

8
src/txmempool.h
View File

@ -604,12 +604,12 @@ public:
* new mempool entries may have children in the mempool (which is generally * new mempool entries may have children in the mempool (which is generally
* not the case when otherwise adding transactions). * not the case when otherwise adding transactions).
* UpdateTransactionsFromBlock() will find child transactions and update the * UpdateTransactionsFromBlock() will find child transactions and update the
* descendant state for each transaction in hashesToUpdate (excluding any * descendant state for each transaction in vHashesToUpdate (excluding any
* child transactions present in hashesToUpdate, which are already accounted * child transactions present in vHashesToUpdate, which are already accounted
* for). Note: hashesToUpdate should be the set of transactions from the * for). Note: vHashesToUpdate should be the set of transactions from the
* disconnected block that have been accepted back into the mempool. * disconnected block that have been accepted back into the mempool.
*/ */
void UpdateTransactionsFromBlock(const std::vector<uint256> &hashesToUpdate); void UpdateTransactionsFromBlock(const std::vector<uint256> &vHashesToUpdate);
/** Try to calculate all in-mempool ancestors of entry. /** Try to calculate all in-mempool ancestors of entry.
* (these are all calculated including the tx itself) * (these are all calculated including the tx itself)

2
src/validation.h
View File

@ -327,7 +327,7 @@ void FlushStateToDisk();
/** Prune block files and flush state to disk. */ /** Prune block files and flush state to disk. */
void PruneAndFlush(); void PruneAndFlush();
/** Prune block files up to a given height */ /** Prune block files up to a given height */
void PruneBlockFilesManual(int nPruneUpToHeight); void PruneBlockFilesManual(int nManualPruneHeight);
/** (try to) add transaction to memory pool */ /** (try to) add transaction to memory pool */
bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree, bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,