From 6b31ac975373cca8a7a008eb89b5d7e3fea9b2ed Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 27 Dec 2017 01:44:26 +0100 Subject: [PATCH] fix typo --- ...sg_signtx_bch.py => test_msg_signtx_bcash.py} | 16 +++++++--------- ...8f1ab0c63321b1be7a8cad7bf5c5c216fcf062c.json} | 0 ...ccb484fc32b96f89c3c39f98d86f90db16076a0.json} | 0 ...7bf752a3977d7e5337915071bb4151e6b711a78.json} | 0 ...8fa6856c6edcbf4d05ebef3486510ae1c293d5f.json} | 0 trezorlib/tx_api.py | 4 +--- 6 files changed, 8 insertions(+), 12 deletions(-) rename trezorlib/tests/device_tests/{test_msg_signtx_bch.py => test_msg_signtx_bcash.py} (97%) rename trezorlib/tests/txcache/{insight_bch_tx_502e8577b237b0152843a416f8f1ab0c63321b1be7a8cad7bf5c5c216fcf062c.json => insight_bcash_tx_502e8577b237b0152843a416f8f1ab0c63321b1be7a8cad7bf5c5c216fcf062c.json} (100%) rename trezorlib/tests/txcache/{insight_bch_tx_8b6db9b8ba24235d86b053ea2ccb484fc32b96f89c3c39f98d86f90db16076a0.json => insight_bcash_tx_8b6db9b8ba24235d86b053ea2ccb484fc32b96f89c3c39f98d86f90db16076a0.json} (100%) rename trezorlib/tests/txcache/{insight_bch_tx_bc37c28dfb467d2ecb50261387bf752a3977d7e5337915071bb4151e6b711a78.json => insight_bcash_tx_bc37c28dfb467d2ecb50261387bf752a3977d7e5337915071bb4151e6b711a78.json} (100%) rename trezorlib/tests/txcache/{insight_bch_tx_f68caf10df12d5b07a34601d88fa6856c6edcbf4d05ebef3486510ae1c293d5f.json => insight_bcash_tx_f68caf10df12d5b07a34601d88fa6856c6edcbf4d05ebef3486510ae1c293d5f.json} (100%) diff --git a/trezorlib/tests/device_tests/test_msg_signtx_bch.py b/trezorlib/tests/device_tests/test_msg_signtx_bcash.py similarity index 97% rename from trezorlib/tests/device_tests/test_msg_signtx_bch.py rename to trezorlib/tests/device_tests/test_msg_signtx_bcash.py index 01c4dc9774..cc7365f1a0 100644 --- a/trezorlib/tests/device_tests/test_msg_signtx_bch.py +++ b/trezorlib/tests/device_tests/test_msg_signtx_bcash.py @@ -17,19 +17,17 @@ from .common import * from trezorlib import messages as proto -from trezorlib.tx_api import TxApiInsight +from trezorlib.tx_api import TxApiBcash from trezorlib.ckd_public import deserialize from trezorlib.client import CallException -TxApiBitcoinCash = TxApiInsight(network='insight_bch', url='https://bch-bitcore2.trezor.io/api/') - @pytest.mark.skip_t2 class TestMsgSigntxBch(TrezorTest): def test_send_bch_change(self): self.setup_mnemonic_allallall() - self.client.set_tx_api(TxApiBitcoinCash) + self.client.set_tx_api(TxApiBcash) inp1 = proto.TxInputType( address_n=self.client.expand_path("44'/145'/0'/0/0"), # 1MH9KKcvdCTY44xVDC2k3fjBbX5Cz29N1q @@ -66,7 +64,7 @@ class TestMsgSigntxBch(TrezorTest): def test_send_bch_nochange(self): self.setup_mnemonic_allallall() - self.client.set_tx_api(TxApiBitcoinCash) + self.client.set_tx_api(TxApiBcash) inp1 = proto.TxInputType( address_n=self.client.expand_path("44'/145'/0'/1/0"), # 1HADRPJpgqBzThepERpVXNi6qRgiLQRNoE @@ -106,7 +104,7 @@ class TestMsgSigntxBch(TrezorTest): def test_attack_amount(self): self.setup_mnemonic_allallall() - self.client.set_tx_api(TxApiBitcoinCash) + self.client.set_tx_api(TxApiBcash) inp1 = proto.TxInputType( address_n=self.client.expand_path("44'/145'/0'/1/0"), # 1HADRPJpgqBzThepERpVXNi6qRgiLQRNoE @@ -167,7 +165,7 @@ class TestMsgSigntxBch(TrezorTest): def test_attack_change_input(self): self.setup_mnemonic_allallall() - self.client.set_tx_api(TxApiBitcoinCash) + self.client.set_tx_api(TxApiBcash) inp1 = proto.TxInputType( address_n=self.client.expand_path("44'/145'/1000'/0/0"), # 1MH9KKcvdCTY44xVDC2k3fjBbX5Cz29N1q @@ -222,7 +220,7 @@ class TestMsgSigntxBch(TrezorTest): def test_send_bch_multisig_wrongchange(self): self.setup_mnemonic_allallall() - self.client.set_tx_api(TxApiBitcoinCash) + self.client.set_tx_api(TxApiBcash) xpubs = [] for n in map(lambda index: self.client.get_public_node(self.client.expand_path("44'/145'/" + str(index) + "'")), range(1, 4)): xpubs.append(n.xpub) @@ -275,7 +273,7 @@ class TestMsgSigntxBch(TrezorTest): def test_send_bch_multisig_change(self): self.setup_mnemonic_allallall() - self.client.set_tx_api(TxApiBitcoinCash) + self.client.set_tx_api(TxApiBcash) xpubs = [] for n in map(lambda index: self.client.get_public_node(self.client.expand_path("44'/145'/" + str(index) + "'")), range(1, 4)): xpubs.append(n.xpub) diff --git a/trezorlib/tests/txcache/insight_bch_tx_502e8577b237b0152843a416f8f1ab0c63321b1be7a8cad7bf5c5c216fcf062c.json b/trezorlib/tests/txcache/insight_bcash_tx_502e8577b237b0152843a416f8f1ab0c63321b1be7a8cad7bf5c5c216fcf062c.json similarity index 100% rename from trezorlib/tests/txcache/insight_bch_tx_502e8577b237b0152843a416f8f1ab0c63321b1be7a8cad7bf5c5c216fcf062c.json rename to trezorlib/tests/txcache/insight_bcash_tx_502e8577b237b0152843a416f8f1ab0c63321b1be7a8cad7bf5c5c216fcf062c.json diff --git a/trezorlib/tests/txcache/insight_bch_tx_8b6db9b8ba24235d86b053ea2ccb484fc32b96f89c3c39f98d86f90db16076a0.json b/trezorlib/tests/txcache/insight_bcash_tx_8b6db9b8ba24235d86b053ea2ccb484fc32b96f89c3c39f98d86f90db16076a0.json similarity index 100% rename from trezorlib/tests/txcache/insight_bch_tx_8b6db9b8ba24235d86b053ea2ccb484fc32b96f89c3c39f98d86f90db16076a0.json rename to trezorlib/tests/txcache/insight_bcash_tx_8b6db9b8ba24235d86b053ea2ccb484fc32b96f89c3c39f98d86f90db16076a0.json diff --git a/trezorlib/tests/txcache/insight_bch_tx_bc37c28dfb467d2ecb50261387bf752a3977d7e5337915071bb4151e6b711a78.json b/trezorlib/tests/txcache/insight_bcash_tx_bc37c28dfb467d2ecb50261387bf752a3977d7e5337915071bb4151e6b711a78.json similarity index 100% rename from trezorlib/tests/txcache/insight_bch_tx_bc37c28dfb467d2ecb50261387bf752a3977d7e5337915071bb4151e6b711a78.json rename to trezorlib/tests/txcache/insight_bcash_tx_bc37c28dfb467d2ecb50261387bf752a3977d7e5337915071bb4151e6b711a78.json diff --git a/trezorlib/tests/txcache/insight_bch_tx_f68caf10df12d5b07a34601d88fa6856c6edcbf4d05ebef3486510ae1c293d5f.json b/trezorlib/tests/txcache/insight_bcash_tx_f68caf10df12d5b07a34601d88fa6856c6edcbf4d05ebef3486510ae1c293d5f.json similarity index 100% rename from trezorlib/tests/txcache/insight_bch_tx_f68caf10df12d5b07a34601d88fa6856c6edcbf4d05ebef3486510ae1c293d5f.json rename to trezorlib/tests/txcache/insight_bcash_tx_f68caf10df12d5b07a34601d88fa6856c6edcbf4d05ebef3486510ae1c293d5f.json diff --git a/trezorlib/tx_api.py b/trezorlib/tx_api.py index 60d30fde36..c5ba9c4506 100644 --- a/trezorlib/tx_api.py +++ b/trezorlib/tx_api.py @@ -183,9 +183,7 @@ TxApiTestnet = TxApiInsight(network='insight_testnet', url='https://testnet-bitc TxApiLitecoin = TxApiInsight(network='insight_litecoin', url='https://ltc-bitcore1.trezor.io/api/') TxApiDash = TxApiInsight(network='insight_dash', url='https://dash-bitcore1.trezor.io/api/') TxApiZcash = TxApiInsight(network='insight_zcash', url='https://zec-bitcore1.trezor.io/api/', zcash=True) -TxApiBcash = TxApiInsight(network='insight_zcash', url='https://bch-bitcore2.trezor.io/api/') +TxApiBcash = TxApiInsight(network='insight_bcash', url='https://bch-bitcore2.trezor.io/api/') TxApiDecredTestnet = TxApiInsight(network='insight_decred_testnet', url='https://testnet.decred.org/api/') - TxApiDogecoin = TxApiBlockCypher(network='blockcypher_dogecoin', url='http://api.blockcypher.com/v1/doge/main/') - TxApiSegnet = TxApiSmartbit(network='smartbit_segnet', url='https://segnet-api.smartbit.com.au/v1/blockchain/')