Fix web3 and yaml dependency

seedemu/layers/ScionRouting.py

@@ -3,7 +3,6 @@
 import os.path
 from typing import Dict
 
-import yaml
 
 from seedemu.core import Emulator, Node, ScionAutonomousSystem, ScionRouter
 from seedemu.layers import Routing, ScionBase, ScionIsd
@@ -175,6 +174,8 @@ def __provision_router_config(router: ScionRouter):
     def _provision_cs_config(node: Node, as_: ScionAutonomousSystem):
         """Set control service configuration."""
 
+        import yaml
+
         # Start building the beaconing section
         beaconing = ["[beaconing]"]
         interval_keys = ["origination_interval", "propagation_interval", "registration_interval"]

seedemu/services/EthereumService/EthUtil.py

@@ -5,15 +5,13 @@
 from datetime import datetime, timezone
 from os import path
 from .EthTemplates import GenesisFileTemplates
-from web3 import Web3
 from sys import stderr
 from time import time
 
 class Genesis():
     """!
     @brief Genesis manage class
     """
-
     __genesis:dict
     __consensusMechanism:ConsensusMechanism
 
@@ -70,6 +68,7 @@ def addLocalAccount(self, address:str, balance:int) -> Genesis:
 
         @returns self, for chaining calls.
         """
+        from web3 import Web3
 
         assert balance >= 0, "Genesis::allocateBalance: balance cannot have a negative value. Requested Balance Value : {}".format(balance)
         checksum_address = Web3.toChecksumAddress(address)
@@ -148,7 +147,6 @@ class EthAccount():
     """
     @brief Ethereum Local Account.
     """
-
     @staticmethod 
     def importAccount(keyfilePath: str, balance:int, password = "admin"):
         """
@@ -181,6 +179,8 @@ def __encryptAccount(account, password:str):
     @staticmethod
     def createEmulatorAccountFromMnemonic(id:int, mnemonic:str, balance:int, index:int, password:str):
         from eth_account import Account
+        from web3 import Web3
+
         Account.enable_unaudited_hdwallet_features()
 
         EthAccount._log('creating node_{} emulator account {} from mnemonic...'.format(id, index))

seedemu/services/EthereumService/__init__.py

@@ -6,5 +6,5 @@
 from .EthTemplates import *
 from .EthEnum import ConsensusMechanism, Syncmode, EthereumServerTypes
 from .EthUtil import Genesis, AccountStructure, SmartContract, EthAccount
-from .EthereumServer import *
-from .EthereumService import *
+from .EthereumServer import EthereumServer, PoAServer, PoWServer, PoSServer, BeaconSetupServer
+from .EthereumService import Blockchain, EthereumService