From 18ef68daf906645586c0bd1e8658769da0cc4ed9 Mon Sep 17 00:00:00 2001
From: vtexier <vit@free.fr>
Date: Wed, 29 May 2019 19:01:24 +0200
Subject: [PATCH] [fix] #91 fix bugs that broke tests
---
duniterpy/documents/block.py | 2 +-
duniterpy/documents/transaction.py | 2 +-
duniterpy/grammars/output.py | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/duniterpy/documents/block.py b/duniterpy/documents/block.py
index 276575c5..e020abf4 100644
--- a/duniterpy/documents/block.py
+++ b/duniterpy/documents/block.py
@@ -362,7 +362,7 @@ The class Block handles Block documents.
sup_lines = 2
tx_max = n + sup_lines + issuers_num * 2 + inputs_num + unlocks_num + outputs_num + has_comment
for index in range(n, tx_max):
- tx_lines += lines[n + index]
+ tx_lines += lines[index]
n += (tx_max - n)
transaction = Transaction.from_compact(currency, tx_lines)
transactions.append(transaction)
diff --git a/duniterpy/documents/transaction.py b/duniterpy/documents/transaction.py
index 0ab2c231..bb3cefd9 100644
--- a/duniterpy/documents/transaction.py
+++ b/duniterpy/documents/transaction.py
@@ -623,7 +623,7 @@ Comment: {comment}
for index in range(0, outputs_num):
output_source = OutputSource.from_inline(lines[n + index])
outputs.append(output_source)
- n += 1
+ n += outputs_num
comment = ""
if has_comment == 1:
diff --git a/duniterpy/grammars/output.py b/duniterpy/grammars/output.py
index ef4b7f5b..dea06e79 100644
--- a/duniterpy/grammars/output.py
+++ b/duniterpy/grammars/output.py
@@ -132,7 +132,7 @@ class CSV:
csv.time = str(time)
return csv
- def compose(self, parser: Any = None, grammar: Any = None, attr_of: str = None):
+ def compose(self, parser: Any = None, grammar: Any = None, attr_of: str = None) -> str:
"""
Return the CSV(time) expression as string format
@@ -190,7 +190,7 @@ class CLTV:
cltv.timestamp = str(timestamp)
return cltv
- def compose(self, parser: Any = None, grammar: Any = None, attr_of: str = None):
+ def compose(self, parser: Any = None, grammar: Any = None, attr_of: str = None) -> str:
"""
Return the CLTV(timestamp) expression as string format
--
GitLab