From 6bdfdf58b2c1580a4d7962d54b93f50b934b6f80 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Wed, 26 May 2021 16:02:22 -0400
Subject: [PATCH] first pass at renaming oragono to ergo

---
 Makefile                                    |  4 ++--
 irctest/controllers/{oragono.py => ergo.py} | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename irctest/controllers/{oragono.py => ergo.py} (95%)

diff --git a/Makefile b/Makefile
index c3343b4..34968c9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,5 +5,5 @@ all: flakes oragono
 flakes:
 	pyflakes3 ./irctest/cases.py ./irctest/client_mock.py ./irctest/controllers/oragono.py irctest/server_tests/*.py
 
-oragono:
-	python3 -m pytest -k "not deprecated" --controller irctest.controllers.oragono
+ergo:
+	python3 -m pytest -k "not deprecated" --controller irctest.controllers.ergo
diff --git a/irctest/controllers/oragono.py b/irctest/controllers/ergo.py
similarity index 95%
rename from irctest/controllers/oragono.py
rename to irctest/controllers/ergo.py
index bfac124..dace1aa 100644
--- a/irctest/controllers/oragono.py
+++ b/irctest/controllers/ergo.py
@@ -127,7 +127,7 @@ def hash_password(password: Union[str, bytes]) -> str:
     # simulate entry of password and confirmation:
     input_ = password + b"\n" + password + b"\n"
     p = subprocess.Popen(
-        ["oragono", "genpasswd"], stdin=subprocess.PIPE, stdout=subprocess.PIPE
+        ["ergo", "genpasswd"], stdin=subprocess.PIPE, stdout=subprocess.PIPE
     )
     out, _ = p.communicate(input_)
     return out.decode("utf-8")
@@ -199,10 +199,10 @@ class OragonoController(BaseServerController, DirectoryBasedController):
         self._config_path = os.path.join(self.directory, "server.yml")
         self._config = config
         self._write_config()
-        subprocess.call(["oragono", "initdb", "--conf", self._config_path, "--quiet"])
-        subprocess.call(["oragono", "mkcerts", "--conf", self._config_path, "--quiet"])
+        subprocess.call(["ergo", "initdb", "--conf", self._config_path, "--quiet"])
+        subprocess.call(["ergo", "mkcerts", "--conf", self._config_path, "--quiet"])
         self.proc = subprocess.Popen(
-            ["oragono", "run", "--conf", self._config_path, "--quiet"]
+            ["ergo", "run", "--conf", self._config_path, "--quiet"]
         )
 
     def registerUser(
@@ -254,9 +254,9 @@ class OragonoController(BaseServerController, DirectoryBasedController):
         config["datastore"]["mysql"] = {
             "enabled": True,
             "host": "localhost",
-            "user": "oragono",
+            "user": "ergo",
             "password": mysql_password,
-            "history-database": "oragono_history",
+            "history-database": "ergo_history",
             "timeout": "3s",
         }
         config["accounts"]["multiclient"] = {