Introduce startBlockHeight to make things more explicit

codablock · codablock · commit b2d150ab77ef · 2019-02-01T08:59:10.000+01:00
diff --git a/src/llmq/quorums_signing.cpp b/src/llmq/quorums_signing.cpp
@@ -562,10 +562,11 @@ CQuorumCPtr CSigningManager::SelectQuorumForSigning(Consensus::LLMQType llmqType
     uint256 startBlock;
     {
         LOCK(cs_main);
-        if (signHeight - SIGN_HEIGHT_OFFSET > chainActive.Height()) {
+        int startBlockHeight = signHeight - SIGN_HEIGHT_OFFSET;
+        if (startBlockHeight > chainActive.Height()) {
             return nullptr;
         }
-        startBlock = chainActive[signHeight - SIGN_HEIGHT_OFFSET]->GetBlockHash();
+        startBlock = chainActive[startBlockHeight]->GetBlockHash();
     }
 
     auto quorums = quorumManager->ScanQuorums(llmqType, startBlock, poolSize);

Original file line number	Diff line number	Diff line change
`@@ -562,10 +562,11 @@ CQuorumCPtr CSigningManager::SelectQuorumForSigning(Consensus::LLMQType llmqType`
`562`	`562`	`uint256 startBlock;`
`563`	`563`	`{`
`564`	`564`	`LOCK(cs_main);`
`565`		`- if (signHeight - SIGN_HEIGHT_OFFSET > chainActive.Height()) {`
	`565`	`+ int startBlockHeight = signHeight - SIGN_HEIGHT_OFFSET;`
	`566`	`+ if (startBlockHeight > chainActive.Height()) {`
`566`	`567`	`return nullptr;`
`567`	`568`	`}`
`568`		`- startBlock = chainActive[signHeight - SIGN_HEIGHT_OFFSET]->GetBlockHash();`
	`569`	`+ startBlock = chainActive[startBlockHeight]->GetBlockHash();`
`569`	`570`	`}`
`570`	`571`
`571`	`572`	`auto quorums = quorumManager->ScanQuorums(llmqType, startBlock, poolSize);`