Merge pull request #340 from pipermerriam/piper/skinny

POC - Simple Key/Value DHT
ethereum · Mar 4, 2021 · 55c3e85 · 55c3e85
2 parents 341e84e + e768023
commit 55c3e85
Show file tree

Hide file tree

Showing 64 changed files with 581 additions and 10,321 deletions.
diff --git a/ddht/tools/benchmark/partials.py b/ddht/tools/benchmark/partials.py
diff --git a/ddht/tools/driver/abc.py b/ddht/tools/driver/abc.py
@@ -17,7 +17,6 @@
     SessionAPI,
 )
 from ddht.v5_1.alexandria.abc import (
-    AdvertisementDatabaseAPI,
     AlexandriaClientAPI,
     AlexandriaNetworkAPI,
     ContentStorageAPI,
@@ -28,11 +27,7 @@
 
 
 class AlexandriaNodeAPI(ABC):
-    commons_content_storage: ContentStorageAPI
-    pinned_content_storage: ContentStorageAPI
-
-    local_advertisement_db: AdvertisementDatabaseAPI
-    remote_advertisement_db: AdvertisementDatabaseAPI
+    storage: ContentStorageAPI
 
     @property
     @abstractmethod

diff --git a/ddht/tools/driver/alexandria.py b/ddht/tools/driver/alexandria.py
@@ -1,5 +1,4 @@
 from contextlib import AsyncExitStack
-import sqlite3
 from typing import AsyncContextManager, AsyncIterator, Collection, Optional, Tuple
 
 from async_generator import asynccontextmanager
@@ -16,10 +15,8 @@
 )
 from ddht.v5_1.abc import NetworkAPI
 from ddht.v5_1.alexandria.abc import AlexandriaClientAPI, AlexandriaNetworkAPI
-from ddht.v5_1.alexandria.advertisement_db import AdvertisementDatabase
-from ddht.v5_1.alexandria.broadcast_log import BroadcastLog
 from ddht.v5_1.alexandria.client import AlexandriaClient
-from ddht.v5_1.alexandria.content_storage import MemoryContentStorage
+from ddht.v5_1.alexandria.content_storage import ContentStorage
 from ddht.v5_1.alexandria.network import AlexandriaNetwork
 
 
@@ -28,15 +25,7 @@ class AlexandriaNode(AlexandriaNodeAPI):
 
     def __init__(self, node: NodeAPI) -> None:
         self.node = node
-        self.commons_content_storage = MemoryContentStorage()
-        self.pinned_content_storage = MemoryContentStorage()
-        self.local_advertisement_db = AdvertisementDatabase(
-            sqlite3.connect(":memory:"),
-        )
-        self.remote_advertisement_db = AdvertisementDatabase(
-            sqlite3.connect(":memory:"),
-        )
-        self.broadcast_log = BroadcastLog(sqlite3.connect(":memory:"))
+        self.storage = ContentStorage.memory()
         self._lock = NamedLock()
 
     @property
@@ -63,10 +52,7 @@ async def client(
 
     @asynccontextmanager
     async def network(
-        self,
-        network: Optional[NetworkAPI] = None,
-        bootnodes: Collection[ENRAPI] = (),
-        max_advertisement_count: int = 32,
+        self, network: Optional[NetworkAPI] = None, bootnodes: Collection[ENRAPI] = (),
     ) -> AsyncIterator[AlexandriaNetworkAPI]:
         network_context: AsyncContextManager[NetworkAPI]
 
@@ -79,14 +65,7 @@ async def network(
         async with self._lock.acquire("AlexandriaNode.network(...)"):
             async with network_context as network:
                 alexandria_network = AlexandriaNetwork(
-                    network=network,
-                    bootnodes=bootnodes,
-                    commons_content_storage=self.commons_content_storage,
-                    pinned_content_storage=self.pinned_content_storage,
-                    local_advertisement_db=self.local_advertisement_db,
-                    broadcast_log=self.broadcast_log,
-                    remote_advertisement_db=self.remote_advertisement_db,
-                    max_advertisement_count=max_advertisement_count,
+                    network=network, bootnodes=bootnodes, storage=self.storage,
                 )
                 async with background_trio_service(alexandria_network):
                     await alexandria_network.ready()