From bf69b15be1085fd12baa0788fc17cb56434473c8 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Tue, 21 Jan 2025 23:06:25 -0800 Subject: [PATCH] chore: remove commented code --- .../src/main/java/org/bitcoinj/core/Peer.java | 51 ------------------- .../java/org/bitcoinj/quorums/LLMQUtils.java | 8 --- 2 files changed, 59 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/core/Peer.java b/core/src/main/java/org/bitcoinj/core/Peer.java index d607b3803..3d7dd4264 100644 --- a/core/src/main/java/org/bitcoinj/core/Peer.java +++ b/core/src/main/java/org/bitcoinj/core/Peer.java @@ -1455,57 +1455,6 @@ protected void processInv(InventoryMessage inv) { } } - // The New InstantSendLock (ISLOCK) -// if(context.instantSendManager != null && context.instantSendManager.isInstantSendEnabled() && -// context.masternodeSync != null && context.masternodeSync.hasSyncFlag(MasternodeSync.SYNC_FLAGS.SYNC_INSTANTSENDLOCKS)) { -// it = instantSendLocks.iterator(); -// while (it.hasNext()) { -// InventoryItem item = it.next(); -// if(!alreadyHave(item)) { -// getdata.addItem(item); -// } -// } -// } - - // The ChainLock (CLSIG) -// if(/*context.sporkManager != null && context.sporkManager.isSporkActive(SporkManager.SPORK_19_CHAINLOCKS_ENABLED) && */ -// context.masternodeSync != null && context.masternodeSync.hasSyncFlag(MasternodeSync.SYNC_FLAGS.SYNC_CHAINLOCKS)) { -// it = chainLocks.iterator(); -// while (it.hasNext()) { -// InventoryItem item = it.next(); -// if (!alreadyHave(item)) { -// getdata.addItem(item); -// } -// } -// } - -// if(context.masternodeSync != null && context.masternodeSync.hasSyncFlag(MasternodeSync.SYNC_FLAGS.SYNC_SPORKS)) { -// it = sporks.iterator(); -// while (it.hasNext()) { -// InventoryItem item = it.next(); -// getdata.addItem(item); -// } -// } - -// if(context.masternodeSync != null && context.masternodeSync.syncFlags.contains(MasternodeSync.SYNC_FLAGS.SYNC_GOVERNANCE)) { -// it = goveranceObjects.iterator(); -// -// while (it.hasNext()) { -// InventoryItem item = it.next(); -// if (!alreadyHave(item)) -// getdata.addItem(item); -// else { -// // The line below can trigger confidence listeners. -// GovernanceVoteConfidence conf = context.getVoteConfidenceTable().seen(item.hash, this.getAddress()); -// -// log.debug("{}: getdata on tx {}", getAddress(), item.hash); -// getdata.addItem(item); -// // Register with the garbage collector that we care about the confidence data for a while. -// pendingVotes.add(conf); -// } -// } -// } - // If we are requesting filteredblocks we have to send a ping after the getdata so that we have a clear // end to the final FilteredBlock's transactions (in the form of a pong) sent to us boolean pingAfterGetData = false; diff --git a/core/src/main/java/org/bitcoinj/quorums/LLMQUtils.java b/core/src/main/java/org/bitcoinj/quorums/LLMQUtils.java index 412f4816d..9ca626fe6 100644 --- a/core/src/main/java/org/bitcoinj/quorums/LLMQUtils.java +++ b/core/src/main/java/org/bitcoinj/quorums/LLMQUtils.java @@ -93,14 +93,6 @@ static boolean evalSpork(LLMQParameters.LLMQType llmqType, long sporkValue) { return sporkValue == 1 && llmqType != LLMQ_100_67 && llmqType != LLMQ_400_60 && llmqType != LLMQ_400_85; } -// boolean isAllMembersConnectedEnabled(LLMQParameters.LLMQType llmqType) { -// return evalSpork(llmqType, Context.get().sporkManager.getSporkValue(SPORK_21_QUORUM_ALL_CONNECTED)); -// } -// -// boolean isQuorumPoseEnabled(LLMQParameters.LLMQType llmqType) { -// return evalSpork(llmqType, Context.get().sporkManager.getSporkValue(SPORK_23_QUORUM_POSE)); -// } - public static boolean isQuorumRotationEnabled(@Nullable AbstractBlockChain headerChain, AbstractBlockChain blockChain, NetworkParameters params, LLMQParameters.LLMQType type) { if (type != params.getLlmqDIP0024InstantSend()) { return false;