neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop CDSNotificationInterface::SyncTransaction()

Browse Source
This commit is contained in:
UdjinM6 2019-05-28 01:36:26 +03:00 committed by Alexander Block
parent 8675a5064d
commit 60a8a93578
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dsnotificationinterface.cpp
View File

@ -72,18 +72,12 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
llmq::quorumDKGSessionManager->UpdatedBlockTip(pindexNew, fInitialDownload); llmq::quorumDKGSessionManager->UpdatedBlockTip(pindexNew, fInitialDownload);
} }
void CDSNotificationInterface::SyncTransaction(const CTransactionRef& tx, const CBlockIndex* pindex, int posInBlock)
{
// TODO when the old InstantSend system is removed, also remove this whole method and all the surrounding compatiblity code
instantsend.SyncTransaction(tx, pindex, posInBlock);
}
void CDSNotificationInterface::TransactionAddedToMempool(const CTransactionRef& ptx) void CDSNotificationInterface::TransactionAddedToMempool(const CTransactionRef& ptx)
{ {
llmq::quorumInstantSendManager->TransactionAddedToMempool(ptx); llmq::quorumInstantSendManager->TransactionAddedToMempool(ptx);
llmq::chainLocksHandler->TransactionAddedToMempool(ptx); llmq::chainLocksHandler->TransactionAddedToMempool(ptx);
CPrivateSend::TransactionAddedToMempool(ptx); CPrivateSend::TransactionAddedToMempool(ptx);
SyncTransaction(ptx); instantsend.SyncTransaction(ptx);
} }
void CDSNotificationInterface::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindex, const std::vector<CTransactionRef>& vtxConflicted) 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
CPrivateSend::BlockConnected(pblock, pindex, vtxConflicted); CPrivateSend::BlockConnected(pblock, pindex, vtxConflicted);
for (const CTransactionRef& ptx : vtxConflicted) { for (const CTransactionRef& ptx : vtxConflicted) {
SyncTransaction(ptx); instantsend.SyncTransaction(ptx);
} }
for (size_t i = 0; i < pblock->vtx.size(); i++) { for (size_t i = 0; i < pblock->vtx.size(); i++) {
SyncTransaction(pblock->vtx[i], pindex, i); instantsend.SyncTransaction(pblock->vtx[i], pindex, i);
} }
} }
@ -115,7 +109,7 @@ void CDSNotificationInterface::BlockDisconnected(const std::shared_ptr<const CBl
CPrivateSend::BlockDisconnected(pblock, pindexDisconnected); CPrivateSend::BlockDisconnected(pblock, pindexDisconnected);
for (const CTransactionRef& ptx : pblock->vtx) { for (const CTransactionRef& ptx : pblock->vtx) {
SyncTransaction(ptx, pindexDisconnected->pprev, -1); instantsend.SyncTransaction(ptx, pindexDisconnected->pprev, -1);
} }
} }

2
src/dsnotificationinterface.h
View File

@ -29,8 +29,6 @@ protected:
private: private:
CConnman& connman; CConnman& connman;
/* Used by TransactionAddedToMemorypool/BlockConnected/Disconnected */
void SyncTransaction(const CTransactionRef& tx, const CBlockIndex* pindex = nullptr, int posInBlock = 0);
}; };
#endif // BITCOIN_DSNOTIFICATIONINTERFACE_H #endif // BITCOIN_DSNOTIFICATIONINTERFACE_H