diff --git a/crypto/configuration/network.py b/crypto/configuration/network.py index 3440123e..8aec94a3 100644 --- a/crypto/configuration/network.py +++ b/crypto/configuration/network.py @@ -1,6 +1,5 @@ from datetime import datetime from typing import Type, TypedDict, Union -from crypto.networks.devnet import Devnet from crypto.networks.mainnet import Mainnet from crypto.networks.testnet import Testnet @@ -10,12 +9,12 @@ class NetworkType(TypedDict): wif: int network: NetworkType = { - 'epoch': Devnet.epoch, - 'version': Devnet.version, - 'wif': Devnet.wif, + 'epoch': Testnet.epoch, + 'version': Testnet.version, + 'wif': Testnet.wif, } -def set_network(network_object: Union[Type[Mainnet], Type[Devnet], Type[Testnet]]) -> None: +def set_network(network_object: Union[Type[Mainnet], Type[Testnet]]) -> None: """Set what network you want to use in the crypto library Args: diff --git a/crypto/networks/devnet.py b/crypto/networks/devnet.py deleted file mode 100644 index dc3d2490..00000000 --- a/crypto/networks/devnet.py +++ /dev/null @@ -1,6 +0,0 @@ -from datetime import datetime - -class Devnet(object): - epoch = datetime(2017, 3, 21, 13, 00, 00) - version = 30 - wif = 170 diff --git a/crypto/networks/mainnet.py b/crypto/networks/mainnet.py index 4b21668b..d352edce 100644 --- a/crypto/networks/mainnet.py +++ b/crypto/networks/mainnet.py @@ -2,5 +2,5 @@ class Mainnet(object): epoch = datetime(2017, 3, 21, 13, 00, 00) - version = 23 - wif = 170 + version = 30 + wif = 186 diff --git a/crypto/networks/testnet.py b/crypto/networks/testnet.py index cb4f73b4..a279eac8 100644 --- a/crypto/networks/testnet.py +++ b/crypto/networks/testnet.py @@ -2,5 +2,5 @@ class Testnet(object): epoch = datetime(2017, 3, 21, 13, 00, 00) - version = 23 + version = 30 wif = 186 diff --git a/tests/configuration/test_network.py b/tests/configuration/test_network.py index 3b608e45..d0a963df 100644 --- a/tests/configuration/test_network.py +++ b/tests/configuration/test_network.py @@ -1,7 +1,7 @@ from datetime import datetime from crypto.configuration.network import get_network, set_custom_network, set_network -from crypto.networks.devnet import Devnet +from crypto.networks.testnet import Testnet from crypto.networks.mainnet import Mainnet from crypto.networks.testnet import Testnet @@ -12,17 +12,19 @@ def test_get_network(): def test_set_network(): - # test main net + # mainnet set_network(Mainnet) result = get_network() - assert result['version'] == 23 - assert result['wif'] == 170 - # test test net + assert result['version'] == 30 + assert result['wif'] == 186 + + # testnet set_network(Testnet) result = get_network() - assert result['version'] == 23 + assert result['version'] == 30 assert result['wif'] == 186 - set_network(Devnet) # set back to devnet so other tests don't fail + + set_network(Testnet) # set back to Testnet so other tests don't fail def test_set_custom_network(): @@ -32,4 +34,5 @@ def test_set_custom_network(): assert result['version'] == 11 assert result['wif'] == 130 assert result['epoch'] == epoch_time - set_network(Devnet) # set back to devnet so other tests don't fail + + set_network(Testnet) # set back to Testnet so other tests don't fail diff --git a/tests/conftest.py b/tests/conftest.py index 6e3ae9f5..e3831b45 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,16 +2,16 @@ import json import os from crypto.configuration.network import set_network -from crypto.networks.devnet import Devnet +from crypto.networks.testnet import Testnet @pytest.fixture(scope='session', autouse=True) def configure_network(): """ - Configures the network to Devnet before running any tests. + Configures the network to Testnet before running any tests. This fixture runs automatically once per test session. """ - set_network(Devnet) + set_network(Testnet) @pytest.fixture def load_transaction_fixture():