Skip to content

Commit

Permalink
Run black
Browse files Browse the repository at this point in the history
  • Loading branch information
merc1er committed Jul 17, 2023
1 parent d31e3cf commit 3fab024
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 50 deletions.
20 changes: 5 additions & 15 deletions tests/network/APIs/test_BitcoinDotComAPI.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,8 @@ def post(self, url, json_request, *args, **kwargs):
},
]
},
{
"vout": [
{},
{}
]
},
{
"vout": [
{},
{}
]
},
{"vout": [{}, {}]},
{"vout": [{}, {}]},
]
)

Expand Down Expand Up @@ -509,7 +499,7 @@ def test_get_unspent(self):
"b3d668379a421820fe89cf1bda4bfd7295202a516a0fa5ca0c8011e4c2fc256d",
"none",
b"\n",
None
None,
),
Unspent(
1000,
Expand All @@ -520,7 +510,7 @@ def test_get_unspent(self):
"c3d668379a421820fe89cf1bda4bfd7295202a516a0fa5ca0c8011e4c2fc256d",
"none",
None,
None
None,
),
Unspent(
1000,
Expand All @@ -531,7 +521,7 @@ def test_get_unspent(self):
"55255e66ab1280fae24896c084c360d5027c1b4ef5b1a5588c4b7af246fdcf7a",
None,
None,
1000
1000,
),
Unspent(
2512699,
Expand Down
26 changes: 17 additions & 9 deletions tests/samples.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,28 @@
)
BITCOIN_CASHADDRESS_CATKN = "bitcoincash:zzfyvx77v2pmgc0vulwlfkl3uzjgh5gnmq37yf2mzf"
BITCOIN_CASHADDRESS_PAY2SH20 = "bitcoincash:pp23x8hm0g8d6nrkesamaqeml3v6daeudvpa7zhktf"
BITCOIN_CASHADDRESS_PAY2SH32 = "bitcoincash:pvch8mmxy0rtfrlarg7ucrxxfzds5pamg73h7370aa87d80gyhqxqaw3dsfwg"
BITCOIN_CASHADDRESS_PAY2SH32 = (
"bitcoincash:pvch8mmxy0rtfrlarg7ucrxxfzds5pamg73h7370aa87d80gyhqxqaw3dsfwg"
)

BITCOIN_CASHADDRESS_TEST = "bchtest:qzfyvx77v2pmgc0vulwlfkl3uzjgh5gnmqjxnsx26x"
BITCOIN_CASHADDRESS_TEST_COMPRESSED = (
"bchtest:qzvsaasdvw6mt9j2rs3gyps673gj86flev3z0s40ln"
)
BITCOIN_CASHADDRESS_TEST_CATKN = "bchtest:zzfyvx77v2pmgc0vulwlfkl3uzjgh5gnmq4vqwgv94"
BITCOIN_CASHADDRESS_TEST_PAY2SH20 = "bchtest:pp23x8hm0g8d6nrkesamaqeml3v6daeudv90694pv4"
BITCOIN_CASHADDRESS_TEST_PAY2SH32 = "bchtest:pvch8mmxy0rtfrlarg7ucrxxfzds5pamg73h7370aa87d80gyhqxq7fqng6m6"
BITCOIN_CASHADDRESS_TEST_PAY2SH32 = (
"bchtest:pvch8mmxy0rtfrlarg7ucrxxfzds5pamg73h7370aa87d80gyhqxq7fqng6m6"
)

BITCOIN_CASHADDRESS_REGTEST = "bchreg:qzfyvx77v2pmgc0vulwlfkl3uzjgh5gnmqg6939eeq"
BITCOIN_CASHADDRESS_REGTEST_COMPRESSED = (
"bchreg:qzvsaasdvw6mt9j2rs3gyps673gj86flevt7e3kuu4"
)
BITCOIN_CASHADDRESS_REGTEST_CATKN = "bchreg:zzfyvx77v2pmgc0vulwlfkl3uzjgh5gnmq0sk0tlxn"
BITCOIN_CASHADDRESS_REGTEST_PAY2SH20 = "bchreg:pp23x8hm0g8d6nrkesamaqeml3v6daeudvlnvykj0n"
BITCOIN_CASHADDRESS_REGTEST_PAY2SH20 = (
"bchreg:pp23x8hm0g8d6nrkesamaqeml3v6daeudvlnvykj0n"
)

VALID_ENDPOINT_URLS = [
"https://rest.bch.actorforth.org/v2/",
Expand Down Expand Up @@ -169,12 +175,14 @@


# CashToken prefixes
CASHTOKEN_CATAGORY_ID = "00fb7b8704f843caf33c436e3386a469e1d004403c388a8b054282d02034f598"
CASHTOKEN_CATAGORY_ID = (
"00fb7b8704f843caf33c436e3386a469e1d004403c388a8b054282d02034f598"
)
CASHTOKEN_CAPABILITY = "none"
CASHTOKEN_COMMITMENT = b"commitment"
CASHTOKEN_AMOUNT = 50
PREFIX_CAPABILITY = b'\xef\x98\xf54 \xd0\x82B\x05\x8b\x8a8<@\x04\xd0\xe1i\xa4\x863nC<\xf3\xcaC\xf8\x04\x87{\xfb\x00 '
PREFIX_CAPABILITY_AMOUNT = b'\xef\x98\xf54 \xd0\x82B\x05\x8b\x8a8<@\x04\xd0\xe1i\xa4\x863nC<\xf3\xcaC\xf8\x04\x87{\xfb\x0002'
PREFIX_CAPABILITY_COMMITMENT = b'\xef\x98\xf54 \xd0\x82B\x05\x8b\x8a8<@\x04\xd0\xe1i\xa4\x863nC<\xf3\xcaC\xf8\x04\x87{\xfb\x00`\ncommitment'
PREFIX_CAPABILITY_COMMITMENT_AMOUNT = b'\xef\x98\xf54 \xd0\x82B\x05\x8b\x8a8<@\x04\xd0\xe1i\xa4\x863nC<\xf3\xcaC\xf8\x04\x87{\xfb\x00p\ncommitment2'
PREFIX_AMOUNT = b'\xef\x98\xf54 \xd0\x82B\x05\x8b\x8a8<@\x04\xd0\xe1i\xa4\x863nC<\xf3\xcaC\xf8\x04\x87{\xfb\x00\x102'
PREFIX_CAPABILITY = b"\xef\x98\xf54 \xd0\x82B\x05\x8b\x8a8<@\x04\xd0\xe1i\xa4\x863nC<\xf3\xcaC\xf8\x04\x87{\xfb\x00 "
PREFIX_CAPABILITY_AMOUNT = b"\xef\x98\xf54 \xd0\x82B\x05\x8b\x8a8<@\x04\xd0\xe1i\xa4\x863nC<\xf3\xcaC\xf8\x04\x87{\xfb\x0002"
PREFIX_CAPABILITY_COMMITMENT = b"\xef\x98\xf54 \xd0\x82B\x05\x8b\x8a8<@\x04\xd0\xe1i\xa4\x863nC<\xf3\xcaC\xf8\x04\x87{\xfb\x00`\ncommitment"
PREFIX_CAPABILITY_COMMITMENT_AMOUNT = b"\xef\x98\xf54 \xd0\x82B\x05\x8b\x8a8<@\x04\xd0\xe1i\xa4\x863nC<\xf3\xcaC\xf8\x04\x87{\xfb\x00p\ncommitment2"
PREFIX_AMOUNT = b"\xef\x98\xf54 \xd0\x82B\x05\x8b\x8a8<@\x04\xd0\xe1i\xa4\x863nC<\xf3\xcaC\xf8\x04\x87{\xfb\x00\x102"
5 changes: 2 additions & 3 deletions tests/test_cashtoken.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
prepare_output,
Unspents,
select_cashtoken_utxo,
_calculate_dust_value
_calculate_dust_value,
)
from bitcash.exceptions import InsufficientFunds, InvalidCashToken, InvalidAddress
from bitcash.cashaddress import Address
Expand Down Expand Up @@ -447,8 +447,7 @@ def test_get_outputs(self):
cashtokenoutput[5] = (546, "c4", "none", None, None)
for i in range(6):
dust = _calculate_dust_value(
BITCOIN_CASHADDRESS_CATKN,
*cashtokenoutput[i][1:]
BITCOIN_CASHADDRESS_CATKN, *cashtokenoutput[i][1:]
)
_ = list(cashtokenoutput[i])
_[0] = dust
Expand Down
68 changes: 45 additions & 23 deletions tests/test_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
wif_to_bytes,
hex_to_asm,
address_to_cashtokenaddress,
cashtokenaddress_to_address
cashtokenaddress_to_address,
)
from .samples import (
BITCOIN_ADDRESS,
Expand Down Expand Up @@ -317,16 +317,19 @@ def test_address_to_public_key_hash():
address_to_public_key_hash(BITCOIN_CASHADDRESS_REGTEST_COMPRESSED)
== PUBKEY_HASH_COMPRESSED
)
assert address_to_public_key_hash(BITCOIN_CASHADDRESS_PAY2SH20) == PUBKEY_HASH_P2SH20
assert (
address_to_public_key_hash(BITCOIN_CASHADDRESS_TEST_PAY2SH20) ==
PUBKEY_HASH_P2SH20
address_to_public_key_hash(BITCOIN_CASHADDRESS_PAY2SH20) == PUBKEY_HASH_P2SH20
)
assert (
address_to_public_key_hash(BITCOIN_CASHADDRESS_TEST_PAY2SH20)
== PUBKEY_HASH_P2SH20
)
assert (
address_to_public_key_hash(BITCOIN_CASHADDRESS_PAY2SH32) == PUBKEY_HASH_P2SH32
)
assert (
address_to_public_key_hash(BITCOIN_CASHADDRESS_TEST_PAY2SH32) == PUBKEY_HASH_P2SH32
address_to_public_key_hash(BITCOIN_CASHADDRESS_TEST_PAY2SH32)
== PUBKEY_HASH_P2SH32
)
assert (
address_to_public_key_hash(BITCOIN_CASHADDRESS_REGTEST_PAY2SH20)
Expand All @@ -343,32 +346,51 @@ def test_to_and_from_cashtokenaddress():
assert cashtokenaddress_to_address(cashtokenaddress) == BITCOIN_CASHADDRESS_TEST

# test vectors from https://github.com/bitjson/cashtokens
address = address_to_cashtokenaddress("bitcoincash:qr7fzmep8g7h7ymfxy74lgc0v950j3r2959lhtxxsl")
address = address_to_cashtokenaddress(
"bitcoincash:qr7fzmep8g7h7ymfxy74lgc0v950j3r2959lhtxxsl"
)
assert "bitcoincash:zr7fzmep8g7h7ymfxy74lgc0v950j3r295z4y4gq0v" == address
address = address_to_cashtokenaddress("bchtest:qr7fzmep8g7h7ymfxy74lgc0v950j3r295pdnvy3hr")
address = address_to_cashtokenaddress(
"bchtest:qr7fzmep8g7h7ymfxy74lgc0v950j3r295pdnvy3hr"
)
assert "bchtest:zr7fzmep8g7h7ymfxy74lgc0v950j3r295x8qj2hgs" == address
address = address_to_cashtokenaddress("bchreg:qr7fzmep8g7h7ymfxy74lgc0v950j3r295m39d8z59")
address = address_to_cashtokenaddress(
"bchreg:qr7fzmep8g7h7ymfxy74lgc0v950j3r295m39d8z59"
)
assert "bchreg:zr7fzmep8g7h7ymfxy74lgc0v950j3r295umknfytk" == address
address = address_to_cashtokenaddress("bitcoincash:ppawqn2h74a4t50phuza84kdp3794pq3ccvm92p8sh")
address = address_to_cashtokenaddress(
"bitcoincash:ppawqn2h74a4t50phuza84kdp3794pq3ccvm92p8sh"
)
assert "bitcoincash:rpawqn2h74a4t50phuza84kdp3794pq3cct3k50p0y" == address
address = address_to_cashtokenaddress("bitcoincash:pvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqpkp7fqn0")
assert "bitcoincash:rvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqn9alsp2y" == address
address = address_to_cashtokenaddress(
"bitcoincash:pvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqpkp7fqn0"
)
assert (
"bitcoincash:rvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqn9alsp2y"
== address
)


def test_hex_to_asm():
asm = hex_to_asm("76a9147ff07a9532d16a3fe14112e8c856093b81c25a6a88ac")
assert asm == ("OP_DUP OP_HASH160 7ff07a9532d16a3fe14112e8c856093b81c25a6a"
" OP_EQUALVERIFY OP_CHECKSIG")
asm = hex_to_asm("6a0442434d52206b2000be5ce5527cd653c49cdba486e2fd0ec4214"
"da2f71d7e56ad027b2139f448676973742e67697468756275736572"
"636f6e74656e742e636f6d2f6d722d7a776574732f3834623030353"
"7383038616632306466333932383135666232376434613636312f72"
"6177")
assert asm == ("OP_RETURN 1380795202 6b2000be5ce5527cd653c49cdba486e2fd0"
"ec4214da2f71d7e56ad027b2139f4 676973742e6769746875627573"
"6572636f6e74656e742e636f6d2f6d722d7a776574732f3834623030"
"3537383038616632306466333932383135666232376434613636312f"
"726177")
assert asm == (
"OP_DUP OP_HASH160 7ff07a9532d16a3fe14112e8c856093b81c25a6a"
" OP_EQUALVERIFY OP_CHECKSIG"
)
asm = hex_to_asm(
"6a0442434d52206b2000be5ce5527cd653c49cdba486e2fd0ec4214"
"da2f71d7e56ad027b2139f448676973742e67697468756275736572"
"636f6e74656e742e636f6d2f6d722d7a776574732f3834623030353"
"7383038616632306466333932383135666232376434613636312f72"
"6177"
)
assert asm == (
"OP_RETURN 1380795202 6b2000be5ce5527cd653c49cdba486e2fd0"
"ec4214da2f71d7e56ad027b2139f4 676973742e6769746875627573"
"6572636f6e74656e742e636f6d2f6d722d7a776574732f3834623030"
"3537383038616632306466333932383135666232376434613636312f"
"726177"
)
# empty test
asm = hex_to_asm("6a4c00147ff07a9532d16a3fe14112e8c856093b81c25a6a")
assert asm == ("OP_RETURN 7ff07a9532d16a3fe14112e8c856093b81c25a6a")

0 comments on commit 3fab024

Please sign in to comment.