Skip to content

Commit ea7fbec

Browse files
committed
feat(sync-v2): Implement new protocol for synchronizing transactions
1 parent 3c8698e commit ea7fbec

14 files changed

+226
-1272
lines changed

hathor/indexes/deps_index.py

Lines changed: 0 additions & 195 deletions
This file was deleted.

hathor/indexes/manager.py

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
from hathor.indexes.address_index import AddressIndex
2323
from hathor.indexes.base_index import BaseIndex
24-
from hathor.indexes.deps_index import DepsIndex
2524
from hathor.indexes.height_index import HeightIndex
2625
from hathor.indexes.info_index import InfoIndex
2726
from hathor.indexes.mempool_tips_index import MempoolTipsIndex
@@ -61,7 +60,6 @@ class IndexesManager(ABC):
6160
sorted_txs: TimestampIndex
6261

6362
height: HeightIndex
64-
deps: Optional[DepsIndex]
6563
mempool_tips: Optional[MempoolTipsIndex]
6664
addresses: Optional[AddressIndex]
6765
tokens: Optional[TokensIndex]
@@ -90,7 +88,6 @@ def iter_all_indexes(self) -> Iterator[BaseIndex]:
9088
self.sorted_blocks,
9189
self.sorted_txs,
9290
self.height,
93-
self.deps,
9491
self.mempool_tips,
9592
self.addresses,
9693
self.tokens,
@@ -112,11 +109,6 @@ def enable_utxo_index(self) -> None:
112109
"""Enable UTXO index. It does nothing if it has already been enabled."""
113110
raise NotImplementedError
114111

115-
@abstractmethod
116-
def enable_deps_index(self) -> None:
117-
"""Enable dependencies index. It does nothing if it has already been enabled."""
118-
raise NotImplementedError
119-
120112
@abstractmethod
121113
def enable_mempool_index(self) -> None:
122114
"""Enable mempool index. It does nothing if it has already been enabled."""
@@ -194,8 +186,6 @@ def update(self, tx: BaseTransaction) -> None:
194186
"""
195187
# XXX: this _should_ be here, but it breaks some tests, for now this is done explicitly in hathor.manager
196188
# self.mempool_tips.update(tx)
197-
if self.deps:
198-
self.deps.update(tx)
199189
if self.utxo:
200190
self.utxo.update(tx)
201191

@@ -226,10 +216,6 @@ def add_tx(self, tx: BaseTransaction) -> bool:
226216
if self.tokens:
227217
self.tokens.add_tx(tx)
228218

229-
# XXX: this method is idempotent and has no result
230-
if self.deps:
231-
self.deps.add_tx(tx)
232-
233219
# We need to check r1 as well to make sure we don't count twice the transactions/blocks that are
234220
# just changing from voided to executed or vice-versa
235221
if r1 and r3:
@@ -272,10 +258,6 @@ def del_tx(self, tx: BaseTransaction, *, remove_all: bool = False, relax_assert:
272258
if self.tokens:
273259
self.tokens.del_tx(tx)
274260

275-
# XXX: this method is idempotent and has no result
276-
if self.deps:
277-
self.deps.del_tx(tx)
278-
279261

280262
class MemoryIndexesManager(IndexesManager):
281263
def __init__(self) -> None:
@@ -298,7 +280,6 @@ def __init__(self) -> None:
298280
self.utxo = None
299281
self.height = MemoryHeightIndex()
300282
self.mempool_tips = None
301-
self.deps = None
302283

303284
# XXX: this has to be at the end of __init__, after everything has been initialized
304285
self.__init_checks__()
@@ -323,11 +304,6 @@ def enable_mempool_index(self) -> None:
323304
if self.mempool_tips is None:
324305
self.mempool_tips = MemoryMempoolTipsIndex()
325306

326-
def enable_deps_index(self) -> None:
327-
from hathor.indexes.memory_deps_index import MemoryDepsIndex
328-
if self.deps is None:
329-
self.deps = MemoryDepsIndex()
330-
331307

332308
class RocksDBIndexesManager(IndexesManager):
333309
def __init__(self, rocksdb_storage: 'RocksDBStorage') -> None:
@@ -352,7 +328,6 @@ def __init__(self, rocksdb_storage: 'RocksDBStorage') -> None:
352328
self.tokens = None
353329
self.utxo = None
354330
self.mempool_tips = None
355-
self.deps = None
356331

357332
# XXX: this has to be at the end of __init__, after everything has been initialized
358333
self.__init_checks__()
@@ -377,9 +352,3 @@ def enable_mempool_index(self) -> None:
377352
if self.mempool_tips is None:
378353
# XXX: use of RocksDBMempoolTipsIndex is very slow and was suspended
379354
self.mempool_tips = MemoryMempoolTipsIndex()
380-
381-
def enable_deps_index(self) -> None:
382-
from hathor.indexes.memory_deps_index import MemoryDepsIndex
383-
if self.deps is None:
384-
# XXX: use of RocksDBDepsIndex is currently suspended until it is fixed
385-
self.deps = MemoryDepsIndex()

0 commit comments

Comments
 (0)