Skip to content

Commit 60a8a93

Browse files
UdjinM6codablock
authored andcommitted
Drop CDSNotificationInterface::SyncTransaction()
1 parent 8675a50 commit 60a8a93

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

src/dsnotificationinterface.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,12 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
7272
llmq::quorumDKGSessionManager->UpdatedBlockTip(pindexNew, fInitialDownload);
7373
}
7474

75-
void CDSNotificationInterface::SyncTransaction(const CTransactionRef& tx, const CBlockIndex* pindex, int posInBlock)
76-
{
77-
// TODO when the old InstantSend system is removed, also remove this whole method and all the surrounding compatiblity code
78-
instantsend.SyncTransaction(tx, pindex, posInBlock);
79-
}
80-
8175
void CDSNotificationInterface::TransactionAddedToMempool(const CTransactionRef& ptx)
8276
{
8377
llmq::quorumInstantSendManager->TransactionAddedToMempool(ptx);
8478
llmq::chainLocksHandler->TransactionAddedToMempool(ptx);
8579
CPrivateSend::TransactionAddedToMempool(ptx);
86-
SyncTransaction(ptx);
80+
instantsend.SyncTransaction(ptx);
8781
}
8882

8983
void CDSNotificationInterface::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindex, const std::vector<CTransactionRef>& vtxConflicted)
@@ -101,10 +95,10 @@ void CDSNotificationInterface::BlockConnected(const std::shared_ptr<const CBlock
10195
CPrivateSend::BlockConnected(pblock, pindex, vtxConflicted);
10296

10397
for (const CTransactionRef& ptx : vtxConflicted) {
104-
SyncTransaction(ptx);
98+
instantsend.SyncTransaction(ptx);
10599
}
106100
for (size_t i = 0; i < pblock->vtx.size(); i++) {
107-
SyncTransaction(pblock->vtx[i], pindex, i);
101+
instantsend.SyncTransaction(pblock->vtx[i], pindex, i);
108102
}
109103
}
110104

@@ -115,7 +109,7 @@ void CDSNotificationInterface::BlockDisconnected(const std::shared_ptr<const CBl
115109
CPrivateSend::BlockDisconnected(pblock, pindexDisconnected);
116110

117111
for (const CTransactionRef& ptx : pblock->vtx) {
118-
SyncTransaction(ptx, pindexDisconnected->pprev, -1);
112+
instantsend.SyncTransaction(ptx, pindexDisconnected->pprev, -1);
119113
}
120114
}
121115

src/dsnotificationinterface.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ class CDSNotificationInterface : public CValidationInterface
2929

3030
private:
3131
CConnman& connman;
32-
/* Used by TransactionAddedToMemorypool/BlockConnected/Disconnected */
33-
void SyncTransaction(const CTransactionRef& tx, const CBlockIndex* pindex = nullptr, int posInBlock = 0);
3432
};
3533

3634
#endif // BITCOIN_DSNOTIFICATIONINTERFACE_H

0 commit comments

Comments
 (0)