From 1bff28bb9061391574c18881a0513942ca16677a Mon Sep 17 00:00:00 2001
From: Jonas SPRENGER <sprengerjo@gmail.com>
Date: Sun, 6 Oct 2019 14:23:22 +0200
Subject: [PATCH] WIP
---
Cargo.lock | 1 +
lib/modules/gva/Cargo.toml | 1 +
lib/modules/gva/lib.rs | 21 ++++++++++++++++++---
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index ed4d23be..dea3572b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -689,6 +689,7 @@ dependencies = [
name = "durs-gva"
version = "0.1.0"
dependencies = [
+ "dubp-block-doc 0.1.0",
"dubp-currency-params 0.2.0",
"dubp-user-docs 0.14.0",
"dup-crypto 0.7.0",
diff --git a/lib/modules/gva/Cargo.toml b/lib/modules/gva/Cargo.toml
index bc9a6ce2..0b5ea7a7 100644
--- a/lib/modules/gva/Cargo.toml
+++ b/lib/modules/gva/Cargo.toml
@@ -19,6 +19,7 @@ dup-crypto = { path = "../../crypto" }
dubp-currency-params = { path = "../../dubp/currency-params" }
durs-common-tools = { path = "../../tools/common-tools" }
durs-bc-db-reader = { path = "../../modules-lib/bc-db-reader" }
+dubp-block-doc = { path = "../../dubp/block-doc"}
failure = "0.1.5"
log = "0.4.*"
serde = "1.0.*"
diff --git a/lib/modules/gva/lib.rs b/lib/modules/gva/lib.rs
index d04afdaa..31deb245 100644
--- a/lib/modules/gva/lib.rs
+++ b/lib/modules/gva/lib.rs
@@ -46,6 +46,7 @@ use std::ops::Deref;
use std::sync::mpsc;
use std::thread;
use std::time::{Duration, SystemTime};
+use dubp_block_doc::block::BlockDocumentTrait;
/// Name of your module
pub static MODULE_NAME: &str = "gva";
@@ -197,9 +198,23 @@ impl DursModule<DuRsConf, DursMsg> for GvaModule {
let current_blockstamp = durs_bc_db_reader::current_meta_datas::get_current_blockstamp(&db);
let current_common_time = durs_bc_db_reader::current_meta_datas::get_current_common_time(&db);
- println!("current_blockstamp: {:#?}",current_blockstamp);
- println!("currency_name: {:#?}",currency_name);
- println!("current_common_time: {:#?}",current_common_time);
+ let current_block = durs_bc_db_reader::blocks::get_current_block(&db);
+
+ let message = match current_block {
+ Ok(Some(block)) => {
+ let b_num = match block.block {
+ dubp_block_doc::BlockDocument::V10(v) => format!("{:#?}",v.number)
+ };
+ b_num
+ },
+ Ok(None) => String::from("No current block!"),
+ Err(err) => format!("Erro: {:#?}",err),
+ };
+
+// println!("current_blockstamp: {:#?}",current_blockstamp);
+// println!("currency_name: {:#?}",currency_name);
+// println!("current_common_time: {:#?}",current_common_time);
+ println!("{}",message);
thread::sleep(ten_millis);
}
--
GitLab