Unified network settings and removal of config file

brownie/__init__.py

@@ -1,11 +1,13 @@
 #!/usr/bin/python3
 
-from brownie._config import CONFIG as config
+from brownie._config import CONFIG as _CONFIG
 from brownie.convert import Fixed, Wei
 from brownie.project import compile_source, run
 from brownie.network import accounts, alert, history, rpc, web3
 from brownie.network.contract import Contract  # NOQA: F401
 
+config = _CONFIG.settings
+
 __all__ = [
     "accounts",  # accounts is an Accounts singleton
     "alert",

brownie/_cli/__main__.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 
 from brownie import network
-from brownie._config import ARGV
+from brownie._config import CONFIG
 from brownie.exceptions import ProjectNotFound
 from brownie.utils import color, notify
 from brownie.utils.docopt import docopt, levenshtein_norm
@@ -23,6 +23,7 @@
   test               Run test cases in the tests/ folder
   run                Run a script in the scripts/ folder
   accounts           Manage local accounts
+  networks           Manage network settings
   gui                Load the GUI to view opcodes and test coverage
   analyze            Find security vulnerabilities using the MythX API
 
@@ -49,7 +50,7 @@ def main():
             sys.exit(f"Invalid command. Did you mean 'brownie {distances[0][0]}'?")
         sys.exit("Invalid command. Try 'brownie --help' for available commands.")
 
-    ARGV["cli"] = cmd
+    CONFIG.argv["cli"] = cmd
     sys.modules["brownie"].a = network.accounts
     sys.modules["brownie"].__all__.append("a")
 

brownie/_cli/analyze.py

@@ -15,7 +15,7 @@
 
 from brownie import project
 from brownie._cli.__main__ import __version__
-from brownie._config import ARGV, _update_argv_from_docopt
+from brownie._config import CONFIG, _update_argv_from_docopt
 from brownie.exceptions import ProjectNotFound
 from brownie.utils import color, notify
 from brownie.utils.docopt import docopt
@@ -73,8 +73,8 @@ def get_mythx_client() -> Client:
         :return: A PythX client instance
         """
 
-        if ARGV["api-key"]:
-            auth_args = {"api_key": ARGV["api-key"]}
+        if CONFIG.argv["api-key"]:
+            auth_args = {"api_key": CONFIG.argv["api-key"]}
         elif environ.get("MYTHX_API_KEY"):
             auth_args = {"api_key": environ.get("MYTHX_API_KEY")}
         else:
@@ -156,7 +156,7 @@ def construct_request_from_artifact(cls, artifact) -> AnalysisSubmissionRequest:
             source_list=source_list or None,
             main_source=artifact.get("sourcePath"),
             solc_version=artifact.get("compiler", {}).get("version"),
-            analysis_mode=ARGV["mode"] or ANALYSIS_MODES[0],
+            analysis_mode=CONFIG.argv["mode"] or ANALYSIS_MODES[0],
         )
 
     def send_requests(self) -> None:
@@ -202,7 +202,7 @@ def wait_for_jobs(self) -> None:
             raise ValidationError("No requests given")
         for contract_name, response in self.responses.items():
             while not self.client.analysis_ready(response.uuid):
-                time.sleep(int(ARGV["interval"]))
+                time.sleep(int(CONFIG.argv["interval"]))
             self.reports[contract_name] = self.client.report(response.uuid)
 
     def generate_highlighting_report(self) -> None:
@@ -308,7 +308,7 @@ def main():
     args = docopt(__doc__)
     _update_argv_from_docopt(args)
 
-    if ARGV["mode"] not in ANALYSIS_MODES:
+    if CONFIG.argv["mode"] not in ANALYSIS_MODES:
         raise ValidationError(
             "Invalid analysis mode: Must be one of [{}]".format(", ".join(ANALYSIS_MODES))
         )
@@ -327,7 +327,7 @@ def main():
     submission.send_requests()
 
     # exit if user wants an async analysis run
-    if ARGV["async"]:
+    if CONFIG.argv["async"]:
         print(
             "\nAll contracts were submitted successfully. Check the dashboard at "
             "https://dashboard.mythx.io/ for the progress and results of your analyses"
@@ -352,7 +352,7 @@ def main():
         json.dump(submission.highlight_report, fp, indent=2, sort_keys=True)
 
     # Launch GUI if user requested it
-    if ARGV["gui"]:
+    if CONFIG.argv["gui"]:
         print("Launching the Brownie GUI")
         gui = importlib.import_module("brownie._gui").Gui
         gui().mainloop()

brownie/_cli/console.py

@@ -7,7 +7,7 @@
 
 import brownie
 from brownie import network, project
-from brownie._config import ARGV, CONFIG, _get_data_folder, _update_argv_from_docopt
+from brownie._config import CONFIG, _get_data_folder, _update_argv_from_docopt
 from brownie.utils import color
 from brownie.utils.docopt import docopt
 
@@ -21,7 +21,7 @@
 __doc__ = f"""Usage: brownie console [options]
 
 Options:
-  --network <name>        Use a specific network (default {CONFIG['network']['default']})
+  --network <name>        Use a specific network (default {CONFIG.settings['networks']['default']})
   --tb -t                 Show entire python traceback on exceptions
   --help -h               Display this message
 
@@ -41,7 +41,7 @@ def main():
         active_project = None
         print("No project was loaded.")
 
-    network.connect(ARGV["network"])
+    network.connect(CONFIG.argv["network"])
 
     shell = Console(active_project)
     shell.interact(banner="Brownie environment is ready.", exitmsg="")