Skip to content
Snippets Groups Projects
Commit 4bca71ef authored by Éloïs's avatar Éloïs
Browse files

Merge branch '67-generate-compact-inner-format-is-wrong-for-blocks-with-dividend' into 'dev'

Resolve "generate compact inner format is wrong for blocks with dividend"

Closes #67

See merge request nodes/rust/duniter-rs!57
parents 6953eb2c 9ec76a51
No related branches found
No related tags found
1 merge request!57Resolve "generate compact inner format is wrong for blocks with dividend"
...@@ -225,6 +225,14 @@ impl BlockDocument { ...@@ -225,6 +225,14 @@ impl BlockDocument {
transactions_str.push_str("\n"); transactions_str.push_str("\n");
transactions_str.push_str(&transaction.generate_compact_text()); transactions_str.push_str(&transaction.generate_compact_text());
} }
let mut dividend_str = String::from("");
if let Some(dividend) = self.dividend {
if dividend > 0 {
dividend_str.push_str("UniversalDividend: ");
dividend_str.push_str(&dividend.to_string());
dividend_str.push_str("\n");
}
}
format!( format!(
"Version: 10 "Version: 10
Type: Block Type: Block
...@@ -233,7 +241,7 @@ Number: {block_number} ...@@ -233,7 +241,7 @@ Number: {block_number}
PoWMin: {pow_min} PoWMin: {pow_min}
Time: {time} Time: {time}
MedianTime: {median_time} MedianTime: {median_time}
UnitBase: {unit_base} {dividend}UnitBase: {unit_base}
Issuer: {issuer} Issuer: {issuer}
IssuersFrame: {issuers_frame} IssuersFrame: {issuers_frame}
IssuersFrameVar: {issuers_frame_var} IssuersFrameVar: {issuers_frame_var}
...@@ -255,6 +263,7 @@ Transactions:{transactions} ...@@ -255,6 +263,7 @@ Transactions:{transactions}
pow_min = self.pow_min, pow_min = self.pow_min,
time = self.time, time = self.time,
median_time = self.median_time, median_time = self.median_time,
dividend = dividend_str,
unit_base = self.unit_base, unit_base = self.unit_base,
issuer = self.issuers[0], issuer = self.issuers[0],
issuers_frame = self.issuers_frame, issuers_frame = self.issuers_frame,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment