aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-17 06:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

rpc_passwd -> rpc_password. The former can be confusing since the bitcoind parameter is rpcpassword. Avoiding that.

Browse Source
This commit is contained in:
Sergi Delgado Segura
2020-04-01 11:14:20 +02:00
parent 18e9a0fe5f
commit 2d67fe8638
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -58,7 +58,7 @@ The configuration file options to change the network where `teos` will run are t
``` ```
[bitcoind] [bitcoind]
btc_rpc_user = "user" btc_rpc_user = "user"
btc_rpc_passwd = "passwd" btc_rpc_password = "passwd"
btc_rpc_connect = "localhost" btc_rpc_connect = "localhost"
btc_rpc_port = 8332 btc_rpc_port = 8332
btc_network = "mainnet" btc_network = "mainnet"
@@ -69,7 +69,7 @@ For regtest, it should look like:
``` ```
[bitcoind] [bitcoind]
btc_rpc_user = "user" btc_rpc_user = "user"
btc_rpc_passwd = "passwd" btc_rpc_password = "passwd"
btc_rpc_connect = "localhost" btc_rpc_connect = "localhost"
btc_rpc_port = 18443 btc_rpc_port = 18443
btc_network = "regtest" btc_network = "regtest"

2
teos/__init__.py
View File

@@ -9,7 +9,7 @@ LOG_PREFIX = "teos"
# Default conf fields # Default conf fields
DEFAULT_CONF = { DEFAULT_CONF = {
"BTC_RPC_USER": {"value": "user", "type": str}, "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_CONNECT": {"value": "127.0.0.1", "type": str},
"BTC_RPC_PORT": {"value": 8332, "type": int}, "BTC_RPC_PORT": {"value": 8332, "type": int},
"BTC_NETWORK": {"value": "mainnet", "type": str}, "BTC_NETWORK": {"value": "mainnet", "type": str},

2
teos/template.conf
View File

@@ -1,6 +1,6 @@
[bitcoind] [bitcoind]
btc_rpc_user = user btc_rpc_user = user
btc_rpc_passwd = passwd btc_rpc_password = passwd
btc_rpc_connect = localhost btc_rpc_connect = localhost
btc_rpc_port = 8332 btc_rpc_port = 8332
btc_network = mainnet btc_network = mainnet

2
teos/teosd.py
View File

@@ -173,7 +173,7 @@ if __name__ == "__main__":
if opt in ["--btcrpcuser"]: if opt in ["--btcrpcuser"]:
command_line_conf["BTC_RPC_USER"] = arg command_line_conf["BTC_RPC_USER"] = arg
if opt in ["--btcrpcpassword"]: if opt in ["--btcrpcpassword"]:
command_line_conf["BTC_RPC_PASSWD"] = arg command_line_conf["BTC_RPC_PASSWORD"] = arg
if opt in ["--btcrpcconnect"]: if opt in ["--btcrpcconnect"]:
command_line_conf["BTC_RPC_CONNECT"] = arg command_line_conf["BTC_RPC_CONNECT"] = arg
if opt in ["--btcrpcport"]: if opt in ["--btcrpcport"]:

2
teos/tools.py
View File

@@ -26,7 +26,7 @@ def bitcoin_cli(btc_connect_params):
"http://%s:%s@%s:%d" "http://%s:%s@%s:%d"
% ( % (
btc_connect_params.get("BTC_RPC_USER"), 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_CONNECT"),
btc_connect_params.get("BTC_RPC_PORT"), btc_connect_params.get("BTC_RPC_PORT"),
) )

2
test/teos/e2e/conftest.py
View File

@@ -22,7 +22,7 @@ def bitcoin_cli():
"http://%s:%s@%s:%d" "http://%s:%s@%s:%d"
% ( % (
config.get("BTC_RPC_USER"), config.get("BTC_RPC_USER"),
config.get("BTC_RPC_PASSWD"), config.get("BTC_RPC_PASSWORD"),
config.get("BTC_RPC_CONNECT"), config.get("BTC_RPC_CONNECT"),
config.get("BTC_RPC_PORT"), config.get("BTC_RPC_PORT"),
) )

2
test/teos/e2e/teos.conf
View File

@@ -1,6 +1,6 @@
[bitcoind] [bitcoind]
btc_rpc_user = user btc_rpc_user = user
btc_rpc_passwd = passwd btc_rpc_password = passwd
btc_rpc_connect = localhost btc_rpc_connect = localhost
btc_rpc_port = 18445 btc_rpc_port = 18445
btc_network = regtest btc_network = regtest