Refetch duplicate-stake rejected block only if blockchain is up-to-date

blockchain/ppc.go

@@ -799,7 +799,6 @@ func (b *BlockChain) GetKernelStakeModifier(hash *wire.ShaHash, timeSource Media
 	return stakeModifier, err
 }
 
-
 // WantedOrphan finds block wanted by given orphan block
 //
 // This function is safe for concurrent access.

blockmanager.go

@@ -644,19 +644,11 @@ func (b *blockManager) handleBlockMsg(bmsg *blockMsg) {
 				"latest block: %v", err)
 		} else {
 			bmsg.peer.PushGetBlocksMsg(locator, orphanRoot)
+			// ppc: getblocks may not obtain the ancestor block rejected
+			// earlier by duplicate-stake check so we ask for it again directly
+			// https://github.com/ppcoin/ppcoin/blob/v0.4.0ppc/src/main.cpp#L2052
+			b.refetchDuplicateStakeRejectedAncestorBlock(bmsg.peer, blockSha)
 		}
-
-		// ppc: getblocks may not obtain the ancestor block rejected
-		// earlier by duplicate-stake check so we ask for it again directly
-		// https://github.com/ppcoin/ppcoin/blob/v0.4.0ppc/src/main.cpp#L2052
-		if b.IsCurrent() {
-			wantedOrphan := b.blockChain.WantedOrphan(blockSha)
-			iv := wire.NewInvVect(wire.InvTypeBlock, wantedOrphan)
-			msgGetData := wire.NewMsgGetData()
-			msgGetData.AddInvVect(iv)
-			bmsg.peer.QueueMessage(msgGetData, nil)
-		}
-
 	} else {
 		// When the block is not an orphan, log information about it and
 		// update the chain state.

ppc.go

@@ -312,3 +312,15 @@ func (m *CPUMiner) SubmitMintBlock(mintBlock *wire.MsgBlock) bool {
 
 	return m.submitBlock(block)
 }
+
+// refetchDuplicateStakeRejectedAncestorBlock
+func (b *blockManager) refetchDuplicateStakeRejectedAncestorBlock(
+	peer *peer, blockSha *wire.ShaHash) {
+	if b.IsCurrent() {
+		wantedOrphan := b.blockChain.WantedOrphan(blockSha)
+		iv := wire.NewInvVect(wire.InvTypeBlock, wantedOrphan)
+		msgGetData := wire.NewMsgGetData()
+		msgGetData.AddInvVect(iv)
+		peer.QueueMessage(msgGetData, nil)
+	}
+}