Fix problem with txn count and failed node

Nikita Khateev · Nikita Khateev · commit 5797e4dd5155 · 2018-06-06T16:52:52.000+03:00
Signed-off-by: Nikita Khateev &lt;nikita.khateev@dsr-corporation.com&gt;
diff --git a/libindy/src/services/pool/catchup.rs b/libindy/src/services/pool/catchup.rs
@@ -78,7 +78,7 @@ impl CatchupHandler {
                 //sending ledger status
                 //TODO not send ledger status directly as response on ping, wait pongs from all nodes?
                 let ls: LedgerStatus = LedgerStatus {
-                    txnSeqNo: self.nodes.len(),
+                    txnSeqNo: self.merkle_tree.count,
                     merkleRoot: self.merkle_tree.root_hash().as_slice().to_base58(),
                     ledgerId: 0,
                     ppSeqNo: None,
@@ -290,6 +290,7 @@ impl CatchupHandler {
                 }
 
                 PoolWorker::dump_new_txns(&self.pool_name, &vec_to_dump)?;
+                self.merkle_tree = PoolWorker::restore_merkle_tree_from_pool_name(&self.pool_name)?;
 
                 process.merkle_tree = temp_mt;
             }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ impl CatchupHandler {`
`78`	`78`	`//sending ledger status`
`79`	`79`	`//TODO not send ledger status directly as response on ping, wait pongs from all nodes?`
`80`	`80`	`let ls: LedgerStatus = LedgerStatus {`
`81`		`- txnSeqNo: self.nodes.len(),`
	`81`	`+ txnSeqNo: self.merkle_tree.count,`
`82`	`82`	`merkleRoot: self.merkle_tree.root_hash().as_slice().to_base58(),`
`83`	`83`	`ledgerId: 0,`
`84`	`84`	`ppSeqNo: None,`
`@@ -290,6 +290,7 @@ impl CatchupHandler {`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`PoolWorker::dump_new_txns(&self.pool_name, &vec_to_dump)?;`
	`293`	`+ self.merkle_tree = PoolWorker::restore_merkle_tree_from_pool_name(&self.pool_name)?;`
`293`	`294`
`294`	`295`	`process.merkle_tree = temp_mt;`
`295`	`296`	`}`