Skip to content
This repository was archived by the owner on Jan 13, 2023. It is now read-only.

Commit 02f4767

Browse files
todofixthistodofixthis
committed
[#145] Reformat multisig commands for PEP-8.
1 parent 24e2c73 commit 02f4767

File tree

5 files changed

+233
-249
lines changed

5 files changed

+233
-249
lines changed

‎iota/multisig/commands/__init__.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# coding=utf-8
22
from __future__ import absolute_import, division, print_function, \
3-
unicode_literals
4-
3+
unicode_literals
54

65
from .create_multisig_address import *
76
from .get_digests import *

‎iota/multisig/commands/create_multisig_address.py‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,55 @@
11
# coding=utf-8
22
from __future__ import absolute_import, division, print_function, \
3-
unicode_literals
3+
unicode_literals
44

55
from typing import List
66

77
import filters as f
8+
89
from iota.commands import FilterCommand, RequestFilter
910
from iota.crypto.types import Digest
1011
from iota.filters import Trytes
1112
from iota.multisig.crypto.addresses import MultisigAddressBuilder
1213

1314
__all__ = [
14-
'CreateMultisigAddressCommand',
15+
'CreateMultisigAddressCommand',
1516
]
1617

1718

1819
class CreateMultisigAddressCommand(FilterCommand):
19-
"""
20-
Implements `create_multisig_address` multisig command.
20+
"""
21+
Implements `create_multisig_address` multisig command.
22+
23+
References:
2124
22-
References:
2325
- :py:meth:`iota.multisig.api.MultisigIota.create_multisig_address`
24-
"""
25-
command = 'createMultisigAddress'
26+
"""
27+
command = 'createMultisigAddress'
2628

27-
def get_request_filter(self):
28-
return CreateMultisigAddressRequestFilter()
29+
def get_request_filter(self):
30+
return CreateMultisigAddressRequestFilter()
2931

30-
def get_response_filter(self):
31-
pass
32+
def get_response_filter(self):
33+
pass
3234

33-
def _execute(self, request):
34-
digests = request['digests'] # type: List[Digest]
35+
def _execute(self, request):
36+
digests = request['digests'] # type: List[Digest]
3537

36-
builder = MultisigAddressBuilder()
38+
builder = MultisigAddressBuilder()
3739

38-
for d in digests:
39-
builder.add_digest(d)
40+
for d in digests:
41+
builder.add_digest(d)
4042

41-
return {
42-
'address': builder.get_address(),
43-
}
43+
return {
44+
'address': builder.get_address(),
45+
}
4446

4547

4648
class CreateMultisigAddressRequestFilter(RequestFilter):
47-
def __init__(self):
48-
super(CreateMultisigAddressRequestFilter, self).__init__({
49-
'digests':
50-
f.Required
51-
| f.Array
52-
| f.FilterRepeater(f.Required | Trytes(result_type=Digest)),
53-
})
49+
def __init__(self):
50+
super(CreateMultisigAddressRequestFilter, self).__init__({
51+
'digests':
52+
f.Required | f.Array | f.FilterRepeater(
53+
f.Required | Trytes(Digest),
54+
),
55+
})

‎iota/multisig/commands/get_digests.py‎

Lines changed: 45 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,71 @@
11
# coding=utf-8
22
from __future__ import absolute_import, division, print_function, \
3-
unicode_literals
3+
unicode_literals
44

55
from typing import Optional
66

77
import filters as f
88

99
from iota.commands import FilterCommand, RequestFilter
10-
from iota.crypto.addresses import AddressGenerator
1110
from iota.crypto.types import Seed
12-
from iota.filters import Trytes
11+
from iota.filters import SecurityLevel, Trytes
1312
from iota.multisig.commands.get_private_keys import GetPrivateKeysCommand
1413

1514
__all__ = [
16-
'GetDigestsCommand',
15+
'GetDigestsCommand',
1716
]
1817

1918

2019
class GetDigestsCommand(FilterCommand):
21-
"""
22-
Implements `getDigests` multisig API command.
20+
"""
21+
Implements `getDigests` multisig API command.
22+
23+
References:
2324
24-
References:
2525
- :py:meth:`iota.multisig.api.MultisigIota.get_digests`
26-
"""
27-
command = 'getDigests'
26+
"""
27+
command = 'getDigests'
2828

29-
def get_request_filter(self):
30-
return GetDigestsRequestFilter()
29+
def get_request_filter(self):
30+
return GetDigestsRequestFilter()
3131

32-
def get_response_filter(self):
33-
pass
32+
def get_response_filter(self):
33+
pass
3434

35-
def _execute(self, request):
36-
count = request['count'] # type: Optional[int]
37-
index = request['index'] # type: int
38-
seed = request['seed'] # type: Seed
39-
security_level = request['securityLevel'] # type: int
35+
def _execute(self, request):
36+
count = request['count'] # type: Optional[int]
37+
index = request['index'] # type: int
38+
seed = request['seed'] # type: Seed
39+
security_level = request['securityLevel'] # type: int
4040

41-
gpk_result =\
42-
GetPrivateKeysCommand(self.adapter)(
43-
seed = seed,
44-
count = count,
45-
index = index,
46-
securityLevel = security_level,
47-
)
41+
gpk_result = GetPrivateKeysCommand(self.adapter)(
42+
seed=seed,
43+
count=count,
44+
index=index,
45+
securityLevel=security_level,
46+
)
4847

49-
return {
50-
'digests': [key.get_digest() for key in gpk_result['keys']],
51-
}
48+
return {
49+
'digests': [key.get_digest() for key in gpk_result['keys']],
50+
}
5251

5352

5453
class GetDigestsRequestFilter(RequestFilter):
55-
def __init__(self):
56-
super(GetDigestsRequestFilter, self).__init__(
57-
{
58-
# Optional Parameters
59-
'count':
60-
f.Type(int) | f.Min(1) | f.Optional(default=1),
61-
62-
'index':
63-
f.Type(int) | f.Min(0) | f.Optional(default=0),
64-
65-
'securityLevel':
66-
f.Type(int)
67-
| f.Min(1)
68-
| f.Optional(default=AddressGenerator.DEFAULT_SECURITY_LEVEL),
69-
70-
# Required Parameters
71-
'seed':
72-
f.Required | Trytes(result_type=Seed),
73-
},
74-
75-
allow_missing_keys = {
76-
'count',
77-
'index',
78-
'securityLevel',
79-
},
80-
)
54+
def __init__(self):
55+
super(GetDigestsRequestFilter, self).__init__(
56+
{
57+
# Optional Parameters
58+
'count': f.Type(int) | f.Min(1) | f.Optional(default=1),
59+
'index': f.Type(int) | f.Min(0) | f.Optional(default=0),
60+
'securityLevel': SecurityLevel,
61+
62+
# Required Parameters
63+
'seed': f.Required | Trytes(Seed),
64+
},
65+
66+
allow_missing_keys={
67+
'count',
68+
'index',
69+
'securityLevel',
70+
},
71+
)

‎iota/multisig/commands/get_private_keys.py‎

Lines changed: 46 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,71 @@
11
# coding=utf-8
22
from __future__ import absolute_import, division, print_function, \
3-
unicode_literals
3+
unicode_literals
44

55
from typing import Optional
66

77
import filters as f
88

99
from iota.commands import FilterCommand, RequestFilter
10-
from iota.crypto.addresses import AddressGenerator
1110
from iota.crypto.signing import KeyGenerator
1211
from iota.crypto.types import Seed
13-
from iota.filters import Trytes
12+
from iota.filters import SecurityLevel, Trytes
1413

1514
__all__ = [
16-
'GetPrivateKeysCommand',
15+
'GetPrivateKeysCommand',
1716
]
1817

1918

2019
class GetPrivateKeysCommand(FilterCommand):
21-
"""
22-
Implements `get_private_keys` multisig API command.
20+
"""
21+
Implements `get_private_keys` multisig API command.
2322
24-
References:
25-
- :py:meth:`iota.multisig.MultisigIota.get_private_key`
26-
- https://github.com/iotaledger/wiki/blob/master/multisigs.md
27-
"""
28-
command = 'getPrivateKeys'
23+
References:
2924
30-
def get_request_filter(self):
31-
return GetPrivateKeysRequestFilter()
25+
- :py:meth:`iota.multisig.MultisigIota.get_private_key`
26+
- https://github.com/iotaledger/wiki/blob/master/multisigs.md
27+
"""
28+
command = 'getPrivateKeys'
3229

33-
def get_response_filter(self):
34-
pass
30+
def get_request_filter(self):
31+
return GetPrivateKeysRequestFilter()
3532

36-
def _execute(self, request):
37-
count = request['count'] # type: Optional[int]
38-
index = request['index'] # type: int
39-
seed = request['seed'] # type: Seed
40-
security_level = request['securityLevel'] # type: int
33+
def get_response_filter(self):
34+
pass
4135

42-
generator = KeyGenerator(seed)
36+
def _execute(self, request):
37+
count = request['count'] # type: Optional[int]
38+
index = request['index'] # type: int
39+
seed = request['seed'] # type: Seed
40+
security_level = request['securityLevel'] # type: int
4341

44-
return {
45-
'keys':
46-
generator.get_keys(start=index, count=count, iterations=security_level),
47-
}
42+
generator = KeyGenerator(seed)
43+
44+
return {
45+
'keys': generator.get_keys(
46+
start=index,
47+
count=count,
48+
iterations=security_level,
49+
),
50+
}
4851

4952

5053
class GetPrivateKeysRequestFilter(RequestFilter):
51-
def __init__(self):
52-
super(GetPrivateKeysRequestFilter, self).__init__(
53-
{
54-
# Optional Parameters
55-
'count':
56-
f.Type(int) | f.Min(1) | f.Optional(default=1),
57-
58-
'index':
59-
f.Type(int) | f.Min(0) | f.Optional(default=0),
60-
61-
'securityLevel':
62-
f.Type(int)
63-
| f.Min(1)
64-
| f.Optional(default=AddressGenerator.DEFAULT_SECURITY_LEVEL),
65-
66-
# Required Parameters
67-
'seed':
68-
f.Required | Trytes(result_type=Seed),
69-
},
70-
71-
allow_missing_keys = {
72-
'count',
73-
'index',
74-
'securityLevel',
75-
},
76-
)
54+
def __init__(self):
55+
super(GetPrivateKeysRequestFilter, self).__init__(
56+
{
57+
# Optional Parameters
58+
'count': f.Type(int) | f.Min(1) | f.Optional(default=1),
59+
'index': f.Type(int) | f.Min(0) | f.Optional(default=0),
60+
'securityLevel': SecurityLevel,
61+
62+
# Required Parameters
63+
'seed': f.Required | Trytes(Seed),
64+
},
65+
66+
allow_missing_keys={
67+
'count',
68+
'index',
69+
'securityLevel',
70+
},
71+
)

0 commit comments

Comments
 (0)