message: Remove unused DisconnectBlockAndInputs.
diff: @@ -2794,77 +2794,6 @@ void ReprocessBlocks(int nBlocks)
  }
  }
  -/*
  - DisconnectBlockAndInputs
  -
  - Remove conflicting blocks for successful SwiftX transaction locks
  - This should be very rare (Probably will never happen)
  -*/
  -// ***TODO*** clean up here
  -bool DisconnectBlockAndInputs(CValidationState& state, CTransaction txLock)
  -{
  - // All modifications to the coin state will be done in this cache.
  - // Only when all have succeeded, we push it to pcoinsTip.
  - // CCoinsViewCache view(*pcoinsTip, true);
  -
  - CBlockIndex* BlockReading = chainActive.Tip();
  - CBlockIndex* pindexNew = NULL;
  -
  - bool foundConflictingTx = false;
  -
  - //remove anything conflicting in the memory pool
  - std::list<CTransaction> txConflicted;
  - mempool.removeConflicts(txLock, txConflicted);
  -
  -
  - // List of what to disconnect (typically nothing)
  - std::vector<CBlockIndex*> vDisconnect;
  -
  - for (unsigned int i = 1; BlockReading && BlockReading->nHeight > 0 && !foundConflictingTx && i < 6; i++) {
  - vDisconnect.push_back(BlockReading);
  - pindexNew = BlockReading->pprev; //new best block
  -
  - CBlock block;
  - if (!ReadBlockFromDisk(block, BlockReading))
  - return AbortNode(state, _("Failed to read block"));
  -
  - // Queue memory transactions to resurrect.
  - // We only do this for blocks after the last checkpoint (reorganisation before that
  - // point should only happen with -reindex/-loadblock, or a misbehaving peer.
  - for (const CTransaction& tx : block.vtx) {
  - if (!tx.IsCoinBase()) {
  - for (const CTxIn& in1 : txLock.vin) {
  - for (const CTxIn& in2 : tx.vin) {
  - if (in1.prevout == in2.prevout) foundConflictingTx = true;
  - }
  - }
  - }
  - }
  -
  - if (BlockReading->pprev == NULL) {
  - assert(BlockReading);
  - break;
  - }
  - BlockReading = BlockReading->pprev;
  - }
  -
  - if (!foundConflictingTx) {
  - LogPrintf("DisconnectBlockAndInputs: Can't find a conflicting transaction to inputs\n");
  - return false;
  - }
  -
  - if (vDisconnect.size() > 0) {
  - LogPrintf("REORGANIZE: Disconnect Conflicting Blocks %lli blocks; %s..\n", vDisconnect.size(), pindexNew->GetBlockHash().ToString());
  - for (CBlockIndex* pindex : vDisconnect) {
  - LogPrintf(" -- disconnect %s\n", pindex->GetBlockHash().ToString());
  - DisconnectTip(state);
  - }
  - }
  -
  - return true;
  -}
  -
  -
  /**
  * Return the tip of the chain with the most work in it, that isn't
  * known to be invalid (it's however far from certain to be valid).
  