assertion in CBlock::SetBestChainInner was too strong

sipa · sipa · commit 9aa459b2947d · 2012-03-20T16:41:36.000+01:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -1457,10 +1457,9 @@ runCommand(std::string strCommand)
         printf("runCommand error: system(%s) returned %d\n", strCommand.c_str(), nErr);
 }
 
+// Called from inside SetBestChain: attaches a block to the new best chain being built
 bool CBlock::SetBestChainInner(CTxDB& txdb, CBlockIndex *pindexNew)
 {
-    assert(pindexNew->pprev == pindexBest);
-
     uint256 hash = GetHash();
 
     // Adding to current best branch

Original file line number	Diff line number	Diff line change
`@@ -1457,10 +1457,9 @@ runCommand(std::string strCommand)`
`1457`	`1457`	`printf("runCommand error: system(%s) returned %d\n", strCommand.c_str(), nErr);`
`1458`	`1458`	`}`
`1459`	`1459`
	`1460`	`+// Called from inside SetBestChain: attaches a block to the new best chain being built`
`1460`	`1461`	`bool CBlock::SetBestChainInner(CTxDB& txdb, CBlockIndex *pindexNew)`
`1461`	`1462`	`{`
`1462`		`- assert(pindexNew->pprev == pindexBest);`
`1463`		`-`
`1464`	`1463`	`uint256 hash = GetHash();`
`1465`	`1464`
`1466`	`1465`	`// Adding to current best branch`