arno
/
trezor-firmware
mirror of https://github.com/trezor/trezor-firmware.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Renamed HDPubkeyType to HDNodePathType

Browse Source
pull/25/head
slush0 10 years ago
parent 77b6b5873d
commit 2b664a6b4d
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

8
tests/test_msg_getaddress_show.py
Unescape View File

@ -17,9 +17,9 @@ class TestMsgGetaddress(common.TrezorTest):
node = bip32.deserialize('xpub661MyMwAqRbcF1zGijBb2K6x9YiJPh58xpcCeLvTxMX6spkY3PcpJ4ABcCyWfskq5DDxM3e6Ez5ePCqG5bnPUXR4wL8TZWyoDaUdiWW7bKy')
multisig = proto_types.MultisigRedeemScriptType(
pubkeys=[proto_types.HDPubkeyType(node=node, address_n=[1]),
proto_types.HDPubkeyType(node=node, address_n=[2]),
proto_types.HDPubkeyType(node=node, address_n=[3])],
pubkeys=[proto_types.HDNodePathType(node=node, address_n=[1]),
proto_types.HDNodePathType(node=node, address_n=[2]),
proto_types.HDNodePathType(node=node, address_n=[3])],
signatures=['', '', ''],
m=2,
)
@ -34,7 +34,7 @@ class TestMsgGetaddress(common.TrezorTest):
pubs = []
for x in range(15):
pubs.append(proto_types.HDPubkeyType(node=node, address_n=[x]))
pubs.append(proto_types.HDNodePathType(node=node, address_n=[x]))
multisig = proto_types.MultisigRedeemScriptType(

26
tests/test_multisig.py
Unescape View File

@ -43,9 +43,9 @@ class TestMultisig(common.TrezorTest):
node = ckd_public.deserialize('xpub661MyMwAqRbcF1zGijBb2K6x9YiJPh58xpcCeLvTxMX6spkY3PcpJ4ABcCyWfskq5DDxM3e6Ez5ePCqG5bnPUXR4wL8TZWyoDaUdiWW7bKy')
multisig = proto_types.MultisigRedeemScriptType(
pubkeys=[proto_types.HDPubkeyType(node=node, address_n=[1]),
proto_types.HDPubkeyType(node=node, address_n=[2]),
proto_types.HDPubkeyType(node=node, address_n=[3])],
pubkeys=[proto_types.HDNodePathType(node=node, address_n=[1]),
proto_types.HDNodePathType(node=node, address_n=[2]),
proto_types.HDNodePathType(node=node, address_n=[3])],
signatures=['', '', ''],
m=2,
)
@ -86,9 +86,9 @@ class TestMultisig(common.TrezorTest):
# Let's do second signature using 3rd key
multisig = proto_types.MultisigRedeemScriptType(
pubkeys=[proto_types.HDPubkeyType(node=node, address_n=[1]),
proto_types.HDPubkeyType(node=node, address_n=[2]),
proto_types.HDPubkeyType(node=node, address_n=[3])],
pubkeys=[proto_types.HDNodePathType(node=node, address_n=[1]),
proto_types.HDNodePathType(node=node, address_n=[2]),
proto_types.HDNodePathType(node=node, address_n=[3])],
signatures=[signatures1[0], '', ''], # Fill signature from previous signing process
m=2,
)
@ -137,9 +137,9 @@ class TestMultisig(common.TrezorTest):
node = ckd_public.deserialize('xpub661MyMwAqRbcF1zGijBb2K6x9YiJPh58xpcCeLvTxMX6spkY3PcpJ4ABcCyWfskq5DDxM3e6Ez5ePCqG5bnPUXR4wL8TZWyoDaUdiWW7bKy')
multisig = proto_types.MultisigRedeemScriptType(
pubkeys=[proto_types.HDPubkeyType(node=node, address_n=[1]),
proto_types.HDPubkeyType(node=node, address_n=[2]),
proto_types.HDPubkeyType(node=node, address_n=[3])],
pubkeys=[proto_types.HDNodePathType(node=node, address_n=[1]),
proto_types.HDNodePathType(node=node, address_n=[2]),
proto_types.HDNodePathType(node=node, address_n=[3])],
signatures=['', '', ''],
m=2,
)
@ -147,7 +147,7 @@ class TestMultisig(common.TrezorTest):
pubs = []
for x in range(15):
pubs.append(proto_types.HDPubkeyType(node=node, address_n=[x]))
pubs.append(proto_types.HDNodePathType(node=node, address_n=[x]))
# redeeemscript
# 5f21023230848585885f63803a0a8aecdd6538792d5c539215c91698e315bf0253b43d210338d78612e990f2eea0c426b5e48a8db70b9d7ed66282b3b26511e0b1c75515a621038caebd6f753bbbd2bb1f3346a43cd32140648583673a31d62f2dfb56ad0ab9e32103477b9f0f34ae85434ce795f0c5e1e90c9420e5b5fad084d7cce9a487b94a79022103fe91eca10602d7dad4c9dab2b2a0858f71e25a219a6940749ce7a48118480dae210234716c01c2dd03fa7ee302705e2b8fbd1311895d94b1dca15e62eedea9b0968f210341fb2ead334952cf60f4481ba435c4693d0be649be01d2cfe9b02018e483e7bd2102dad8b2bce360a705c16e74a50a36459b4f8f4b78f9cd67def29d54ef6f7c7cf9210222dbe3f5f197a34a1d50e2cbe2a1085cac2d605c9e176f9a240e0fd0c669330d2103fb41afab56c9cdb013fda63d777d4938ddc3cb2ad939712da688e3ed333f95982102435f177646bdc717cb3211bf46656ca7e8d642726144778c9ce816b8b8c36ccf2102158d8e20095364031d923c7e9f7f08a14b1be1ddee21fe1a5431168e31345e5521026259794892428ca0818c8fb61d2d459ddfe20e57f50803c7295e6f4e2f5586652102815f910a8689151db627e6e262e0a2075ad5ec2993a6bc1b876a9d420923d681210318f54647f645ff01bd49fedc0219343a6a22d3ea3180a3c3d3097e4b888a8db45fae
@ -203,9 +203,9 @@ class TestMultisig(common.TrezorTest):
node = ckd_public.deserialize('xpub661MyMwAqRbcF1zGijBb2K6x9YiJPh58xpcCeLvTxMX6spkY3PcpJ4ABcCyWfskq5DDxM3e6Ez5ePCqG5bnPUXR4wL8TZWyoDaUdiWW7bKy')
multisig = proto_types.MultisigRedeemScriptType(
pubkeys=[proto_types.HDPubkeyType(node=node, address_n=[1]),
proto_types.HDPubkeyType(node=node, address_n=[2]),
proto_types.HDPubkeyType(node=node, address_n=[3])],
pubkeys=[proto_types.HDNodePathType(node=node, address_n=[1]),
proto_types.HDNodePathType(node=node, address_n=[2]),
proto_types.HDNodePathType(node=node, address_n=[3])],
signatures=['', '', ''],
m=2,
)

Write Preview
Loading…
Cancel
Save