From 2d67fe8638a47e1257fbd2b4addcb0c55e98f00f Mon Sep 17 00:00:00 2001
From: Sergi Delgado Segura <sergi.delgado.s@gmail.com>
Date: Wed, 1 Apr 2020 11:14:20 +0200
Subject: [PATCH] rpc_passwd -> rpc_password. The former can be confusing since
 the bitcoind parameter is rpcpassword. Avoiding that.

---
 README.md                 | 4 ++--
 teos/__init__.py          | 2 +-
 teos/template.conf        | 2 +-
 teos/teosd.py             | 2 +-
 teos/tools.py             | 2 +-
 test/teos/e2e/conftest.py | 2 +-
 test/teos/e2e/teos.conf   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0947250..945047a 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ The configuration file options to change the network where `teos` will run are t
 ```
 [bitcoind]
 btc_rpc_user = "user"
-btc_rpc_passwd = "passwd"
+btc_rpc_password = "passwd"
 btc_rpc_connect = "localhost"
 btc_rpc_port = 8332
 btc_network = "mainnet"
@@ -69,7 +69,7 @@ For regtest, it should look like:
 ```
 [bitcoind]
 btc_rpc_user = "user"
-btc_rpc_passwd = "passwd"
+btc_rpc_password = "passwd"
 btc_rpc_connect = "localhost"
 btc_rpc_port = 18443
 btc_network = "regtest"
diff --git a/teos/__init__.py b/teos/__init__.py
index ef94053..acd5f83 100644
--- a/teos/__init__.py
+++ b/teos/__init__.py
@@ -9,7 +9,7 @@ LOG_PREFIX = "teos"
 # Default conf fields
 DEFAULT_CONF = {
     "BTC_RPC_USER": {"value": "user", "type": str},
-    "BTC_RPC_PASSWD": {"value": "passwd", "type": str},
+    "BTC_RPC_PASSWORD": {"value": "passwd", "type": str},
     "BTC_RPC_CONNECT": {"value": "127.0.0.1", "type": str},
     "BTC_RPC_PORT": {"value": 8332, "type": int},
     "BTC_NETWORK": {"value": "mainnet", "type": str},
diff --git a/teos/template.conf b/teos/template.conf
index 46c61e8..1989de6 100644
--- a/teos/template.conf
+++ b/teos/template.conf
@@ -1,6 +1,6 @@
 [bitcoind]
 btc_rpc_user = user
-btc_rpc_passwd = passwd
+btc_rpc_password = passwd
 btc_rpc_connect = localhost
 btc_rpc_port = 8332
 btc_network = mainnet
diff --git a/teos/teosd.py b/teos/teosd.py
index c33e42b..72646fe 100644
--- a/teos/teosd.py
+++ b/teos/teosd.py
@@ -173,7 +173,7 @@ if __name__ == "__main__":
             if opt in ["--btcrpcuser"]:
                 command_line_conf["BTC_RPC_USER"] = arg
             if opt in ["--btcrpcpassword"]:
-                command_line_conf["BTC_RPC_PASSWD"] = arg
+                command_line_conf["BTC_RPC_PASSWORD"] = arg
             if opt in ["--btcrpcconnect"]:
                 command_line_conf["BTC_RPC_CONNECT"] = arg
             if opt in ["--btcrpcport"]:
diff --git a/teos/tools.py b/teos/tools.py
index 25e6f20..dded387 100644
--- a/teos/tools.py
+++ b/teos/tools.py
@@ -26,7 +26,7 @@ def bitcoin_cli(btc_connect_params):
         "http://%s:%s@%s:%d"
         % (
             btc_connect_params.get("BTC_RPC_USER"),
-            btc_connect_params.get("BTC_RPC_PASSWD"),
+            btc_connect_params.get("BTC_RPC_PASSWORD"),
             btc_connect_params.get("BTC_RPC_CONNECT"),
             btc_connect_params.get("BTC_RPC_PORT"),
         )
diff --git a/test/teos/e2e/conftest.py b/test/teos/e2e/conftest.py
index f9e7f0b..eb892c0 100644
--- a/test/teos/e2e/conftest.py
+++ b/test/teos/e2e/conftest.py
@@ -22,7 +22,7 @@ def bitcoin_cli():
         "http://%s:%s@%s:%d"
         % (
             config.get("BTC_RPC_USER"),
-            config.get("BTC_RPC_PASSWD"),
+            config.get("BTC_RPC_PASSWORD"),
             config.get("BTC_RPC_CONNECT"),
             config.get("BTC_RPC_PORT"),
         )
diff --git a/test/teos/e2e/teos.conf b/test/teos/e2e/teos.conf
index 33e4294..6b6fd33 100644
--- a/test/teos/e2e/teos.conf
+++ b/test/teos/e2e/teos.conf
@@ -1,6 +1,6 @@
 [bitcoind]
 btc_rpc_user = user
-btc_rpc_passwd = passwd
+btc_rpc_password = passwd
 btc_rpc_connect = localhost
 btc_rpc_port = 18445
 btc_network = regtest