diff options
| author | practicalswift <practicalswift@users.noreply.github.com> | 2017-06-04 22:45:22 +0200 |
|---|---|---|
| committer | practicalswift <practicalswift@users.noreply.github.com> | 2017-06-05 00:52:36 +0200 |
| commit | 90593ed92cfd5d49900a6fb6c2c10a482ab9fdbb (patch) | |
| tree | 1f830a3679ef00b774dc8ac6b216366f2ed52a68 /src/rpc | |
| parent | f259263a7b11c6ff925851985ef0082b0a190a57 (diff) | |
| download | bitcoin-90593ed92cfd5d49900a6fb6c2c10a482ab9fdbb.tar.xz | |
Limit variable scope
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/mining.cpp | 6 | ||||
| -rw-r--r-- | src/rpc/rawtransaction.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index d744269df1..c6903b8316 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -98,15 +98,13 @@ UniValue getnetworkhashps(const JSONRPCRequest& request) UniValue generateBlocks(std::shared_ptr<CReserveScript> coinbaseScript, int nGenerate, uint64_t nMaxTries, bool keepScript) { static const int nInnerLoopCount = 0x10000; - int nHeightStart = 0; int nHeightEnd = 0; int nHeight = 0; { // Don't keep cs_main locked LOCK(cs_main); - nHeightStart = chainActive.Height(); - nHeight = nHeightStart; - nHeightEnd = nHeightStart+nGenerate; + nHeight = chainActive.Height(); + nHeightEnd = nHeight+nGenerate; } unsigned int nExtraNonce = 0; UniValue blockHashes(UniValue::VARR); diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 683bb25246..f5d876c402 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -838,7 +838,6 @@ UniValue sendrawtransaction(const JSONRPCRequest& request) CTransactionRef tx(MakeTransactionRef(std::move(mtx))); const uint256& hashTx = tx->GetHash(); - bool fLimitFree = true; CAmount nMaxRawTxFee = maxTxFee; if (request.params.size() > 1 && request.params[1].get_bool()) nMaxRawTxFee = 0; @@ -851,6 +850,7 @@ UniValue sendrawtransaction(const JSONRPCRequest& request) // push to local node and sync with wallets CValidationState state; bool fMissingInputs; + bool fLimitFree = true; if (!AcceptToMemoryPool(mempool, state, std::move(tx), fLimitFree, &fMissingInputs, NULL, false, nMaxRawTxFee)) { if (state.IsInvalid()) { throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason())); |