Merge pull request #1533 from carver/light-chain-request-fix

Always use a full chain instance in local server

Author: carver

trinity/nodes/base.py

@@ -16,6 +16,7 @@
     BaseService,
 )
 
+from trinity.chains.full import FullChain
 from trinity.db.header import (
     AsyncHeaderDB,
 )
@@ -40,6 +41,8 @@ class Node(BaseService):
     Create usable nodes by adding subclasses that define the following
     unset attributes.
     """
+    _full_chain: FullChain = None
+
     def __init__(self, event_bus: Endpoint, trinity_config: TrinityConfig) -> None:
         super().__init__()
         self.trinity_config = trinity_config
@@ -84,6 +87,13 @@ def chain_config(self) -> ChainConfig:
     def get_chain(self) -> BaseChain:
         raise NotImplementedError("Node classes must implement this method")
 
+    def get_full_chain(self) -> FullChain:
+        if self._full_chain is None:
+            chain_class = self.chain_config.full_chain_class
+            self._full_chain = chain_class(self.db_manager.get_db())  # type: ignore
+
+        return self._full_chain
+
     @abstractmethod
     def get_peer_pool(self) -> BasePeerPool:
         """

trinity/nodes/full.py

@@ -28,18 +28,15 @@ def chain_class(self) -> Type[FullChain]:
         return self.chain_config.full_chain_class
 
     def get_chain(self) -> FullChain:
-        if self._chain is None:
-            self._chain = self.chain_class(self.db_manager.get_db())  # type: ignore
-
-        return self._chain
+        return self.get_full_chain()
 
     def get_p2p_server(self) -> FullServer:
         if self._p2p_server is None:
             manager = self.db_manager
             self._p2p_server = FullServer(
                 privkey=self._node_key,
                 port=self._node_port,
-                chain=self.get_chain(),
+                chain=self.get_full_chain(),
                 chaindb=manager.get_chaindb(),  # type: ignore
                 headerdb=self.headerdb,
                 base_db=manager.get_db(),  # type: ignore

trinity/nodes/light.py

@@ -4,6 +4,9 @@
 )
 
 from eth_keys.datatypes import PrivateKey
+from eth_utils import (
+    ValidationError,
+)
 
 from lahja import Endpoint
 
@@ -56,7 +59,10 @@ def get_chain(self) -> LightDispatchChain:
         if self._chain is None:
             if self.chain_class is None:
                 raise AttributeError("LightNode subclass must set chain_class")
-            self._chain = self.chain_class(self.headerdb, peer_chain=self._peer_chain)
+            elif self._peer_chain is None:
+                raise ValidationError("peer chain is not initialized!")
+            else:
+                self._chain = self.chain_class(self.headerdb, peer_chain=self._peer_chain)
 
         return self._chain
 
@@ -66,7 +72,7 @@ def get_p2p_server(self) -> LightServer:
             self._p2p_server = LightServer(
                 privkey=self._nodekey,
                 port=self._port,
-                chain=self.get_chain(),
+                chain=self.get_full_chain(),
                 chaindb=manager.get_chaindb(),  # type: ignore
                 headerdb=self.headerdb,
                 base_db=manager.get_db(),  # type: ignore