Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
DuniterPy
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
27
Issues
27
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
clients
python
DuniterPy
Commits
d1baa407
Commit
d1baa407
authored
Apr 26, 2019
by
Moul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[mod] Block document: drop vensions 2 and 3 management
parent
2c4f2057
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
36 deletions
+15
-36
duniterpy/documents/block.py
duniterpy/documents/block.py
+15
-36
No files found.
duniterpy/documents/block.py
View file @
d1baa407
...
@@ -75,8 +75,6 @@ The class Block handles Block documents.
...
@@ -75,8 +75,6 @@ The class Block handles Block documents.
re_previoushash
=
re
.
compile
(
"PreviousHash: ({block_hash_regex})
\n
"
.
format
(
block_hash_regex
=
BLOCK_HASH_REGEX
))
re_previoushash
=
re
.
compile
(
"PreviousHash: ({block_hash_regex})
\n
"
.
format
(
block_hash_regex
=
BLOCK_HASH_REGEX
))
re_previousissuer
=
re
.
compile
(
"PreviousIssuer: ({pubkey_regex})
\n
"
.
format
(
pubkey_regex
=
PUBKEY_REGEX
))
re_previousissuer
=
re
.
compile
(
"PreviousIssuer: ({pubkey_regex})
\n
"
.
format
(
pubkey_regex
=
PUBKEY_REGEX
))
re_parameters
=
re
.
compile
(
"Parameters: ([0-9]+
\\
.[0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):
\
re_parameters
=
re
.
compile
(
"Parameters: ([0-9]+
\\
.[0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):
\
([0-9]+):([0-9]+):([0-9]+
\\
.[0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+
\\
.[0-9]+)
\n
"
)
re_parameters_v10
=
re
.
compile
(
"Parameters: ([0-9]+
\\
.[0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):
\
([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+
\\
.[0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+
\\
.[0-9]+):
\
([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+
\\
.[0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+):([0-9]+
\\
.[0-9]+):
\
([0-9]+):([0-9]+):([0-9]+)
\n
"
)
([0-9]+):([0-9]+):([0-9]+)
\n
"
)
re_memberscount
=
re
.
compile
(
"MembersCount: ([0-9]+)
\n
"
)
re_memberscount
=
re
.
compile
(
"MembersCount: ([0-9]+)
\n
"
)
...
@@ -252,24 +250,18 @@ The class Block handles Block documents.
...
@@ -252,24 +250,18 @@ The class Block handles Block documents.
ud
=
int
(
Block
.
parse_field
(
"UD"
,
lines
[
n
]))
ud
=
int
(
Block
.
parse_field
(
"UD"
,
lines
[
n
]))
n
+=
1
n
+=
1
if
version
>=
3
or
ud
:
unit_base
=
int
(
Block
.
parse_field
(
"UnitBase"
,
lines
[
n
]))
unit_base
=
int
(
Block
.
parse_field
(
"UnitBase"
,
lines
[
n
]))
n
+=
1
n
+=
1
issuer
=
Block
.
parse_field
(
"Issuer"
,
lines
[
n
])
issuer
=
Block
.
parse_field
(
"Issuer"
,
lines
[
n
])
n
+=
1
n
+=
1
if
version
>=
3
:
issuers_frame
=
Block
.
parse_field
(
"IssuersFrame"
,
lines
[
n
])
issuers_frame
=
Block
.
parse_field
(
"IssuersFrame"
,
lines
[
n
])
n
+=
1
n
+=
1
issuers_frame_var
=
Block
.
parse_field
(
"IssuersFrameVar"
,
lines
[
n
])
issuers_frame_var
=
Block
.
parse_field
(
"IssuersFrameVar"
,
lines
[
n
])
n
+=
1
n
+=
1
different_issuers_count
=
Block
.
parse_field
(
"DifferentIssuersCount"
,
lines
[
n
])
different_issuers_count
=
Block
.
parse_field
(
"DifferentIssuersCount"
,
lines
[
n
])
n
+=
1
n
+=
1
else
:
issuers_frame
=
None
issuers_frame_var
=
None
different_issuers_count
=
None
prev_hash
=
None
prev_hash
=
None
prev_issuer
=
None
prev_issuer
=
None
...
@@ -283,16 +275,10 @@ The class Block handles Block documents.
...
@@ -283,16 +275,10 @@ The class Block handles Block documents.
parameters
=
None
parameters
=
None
if
number
==
0
:
if
number
==
0
:
try
:
try
:
if
version
>=
10
:
params_match
=
Block
.
re_parameters
.
match
(
lines
[
n
])
params_match
=
Block
.
re_parameters_v10
.
match
(
lines
[
n
])
if
params_match
is
None
:
if
params_match
is
None
:
raise
MalformedDocumentError
(
"Parameters"
)
raise
MalformedDocumentError
(
"Parameters"
)
parameters
=
params_match
.
groups
()
parameters
=
params_match
.
groups
()
else
:
params_match
=
Block
.
re_parameters
.
match
(
lines
[
n
])
if
params_match
is
None
:
raise
MalformedDocumentError
(
"Parameters"
)
parameters
=
params_match
.
groups
()
n
+=
1
n
+=
1
except
AttributeError
:
except
AttributeError
:
raise
MalformedDocumentError
(
"Parameters"
)
raise
MalformedDocumentError
(
"Parameters"
)
...
@@ -374,12 +360,7 @@ The class Block handles Block documents.
...
@@ -374,12 +360,7 @@ The class Block handles Block documents.
unlocks_num
=
int
(
header_data
.
group
(
4
))
unlocks_num
=
int
(
header_data
.
group
(
4
))
outputs_num
=
int
(
header_data
.
group
(
5
))
outputs_num
=
int
(
header_data
.
group
(
5
))
has_comment
=
int
(
header_data
.
group
(
6
))
has_comment
=
int
(
header_data
.
group
(
6
))
if
version
>
2
:
sup_lines
=
2
if
tx_version
<=
2
:
raise
MalformedDocumentError
(
"TX document is using wrong version"
)
sup_lines
=
2
else
:
sup_lines
=
1
tx_max
=
n
+
sup_lines
+
issuers_num
*
2
+
inputs_num
+
unlocks_num
+
outputs_num
+
has_comment
tx_max
=
n
+
sup_lines
+
issuers_num
*
2
+
inputs_num
+
unlocks_num
+
outputs_num
+
has_comment
for
i
in
range
(
n
,
tx_max
):
for
i
in
range
(
n
,
tx_max
):
tx_lines
+=
lines
[
n
]
tx_lines
+=
lines
[
n
]
...
@@ -419,13 +400,11 @@ MedianTime: {mediantime}
...
@@ -419,13 +400,11 @@ MedianTime: {mediantime}
if
self
.
ud
:
if
self
.
ud
:
doc
+=
"UniversalDividend: {0}
\n
"
.
format
(
self
.
ud
)
doc
+=
"UniversalDividend: {0}
\n
"
.
format
(
self
.
ud
)
if
self
.
version
>=
3
or
self
.
ud
:
doc
+=
"UnitBase: {0}
\n
"
.
format
(
self
.
unit_base
)
doc
+=
"UnitBase: {0}
\n
"
.
format
(
self
.
unit_base
)
doc
+=
"Issuer: {0}
\n
"
.
format
(
self
.
issuer
)
doc
+=
"Issuer: {0}
\n
"
.
format
(
self
.
issuer
)
if
self
.
version
>=
3
:
doc
+=
"""IssuersFrame: {0}
doc
+=
"""IssuersFrame: {0}
IssuersFrameVar: {1}
IssuersFrameVar: {1}
DifferentIssuersCount: {2}
DifferentIssuersCount: {2}
"""
.
format
(
self
.
issuers_frame
,
self
.
issuers_frame_var
,
self
.
different_issuers_count
)
"""
.
format
(
self
.
issuers_frame
,
self
.
issuers_frame_var
,
self
.
different_issuers_count
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment