Use milestone to determine message timestamps (#495)

* Use milestone to determine message timestamps * Fixed failing test * Added cache for milestone response * Added optional url parameter for get_node_info (#523) * fix: reverts first iteration polling logic (#538) * clippy fix * Java binding fix * fix: duplicated declaration * cleanup * fix: clippy * fmt * remove copy derive * fix: java build Co-authored-by: Charlie Varley <[email protected]> Co-authored-by: Lucas Nogueira <[email protected]>
iotaledger · Apr 12, 2021 · 0bdf04d · 0bdf04d
1 parent 68cdbd6
commit 0bdf04d
Show file tree

Hide file tree

Showing 13 changed files with 137 additions and 95 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ chrono = { version = "0.4", features = ["serde"] }
 futures = "0.3"
 getset = "0.1"
 hex = "0.4"
-iota-core = { git = "https://github.com/iotaledger/iota.rs", rev = "8f14d53075222c91560db24478695a7db2238f16", features = ["mqtt"] }
+iota-core = { git = "https://github.com/iotaledger/iota.rs", rev = "f84c97ddccb4a4323d300b32cc6028ff9eabe98b", features = ["mqtt"] }
 log = "0.4"
 once_cell = "1.5"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/bindings/java/native/Cargo.lock b/bindings/java/native/Cargo.lock
diff --git a/bindings/java/native/Cargo.toml b/bindings/java/native/Cargo.toml
@@ -7,7 +7,7 @@ build = "build.rs"
 
 [dependencies]
 iota-wallet = { path = "../../../", version = "0.1.0" }
-iota-core = { git = "https://github.com/iotaledger/iota.rs", rev = "8f14d53075222c91560db24478695a7db2238f16", features = ["mqtt"] }
+iota-core = { git = "https://github.com/iotaledger/iota.rs", rev = "f84c97ddccb4a4323d300b32cc6028ff9eabe98b", features = ["mqtt"] }
 bee-message = { git = "https://github.com/iotaledger/bee.git", branch = "chrysalis-pt-2" }
 log = "0.4.6"
 chrono = "0.4.6"

diff --git a/bindings/java/native/src/java_glue.rs.in b/bindings/java/native/src/java_glue.rs.in
@@ -772,7 +772,6 @@ foreign_class!(
     class TreasuryTransactionPayload {
         self_type TreasuryTransactionPayload;
         private constructor = empty;
-        fn TreasuryTransactionPayload::input(&self) -> MessageId;
         fn TreasuryTransactionPayload::output(&self) -> u64;
     }
 );
diff --git a/bindings/java/native/src/types/info_response.rs b/bindings/java/native/src/types/info_response.rs
@@ -10,10 +10,15 @@ use iota::{
 pub struct NodeInfoWrapper {
     #[getset(get = "pub")]
     url: String,
-    #[getset(get_copy = "pub")]
     nodeinfo: InfoResponse,
 }
 
+impl NodeInfoWrapper {
+    pub fn nodeinfo(&self) -> InfoResponse {
+        self.nodeinfo.clone()
+    }
+}
+
 impl From<RustNodeInfoWrapper> for NodeInfoWrapper {
     fn from(info: RustNodeInfoWrapper) -> Self {
         Self {
@@ -38,7 +43,7 @@ impl From<RustNodeInfoWrapper> for NodeInfoWrapper {
     }
 }
 
-#[derive(PartialEq, Getters, CopyGetters, Copy)]
+#[derive(Clone, PartialEq, Getters, CopyGetters)]
 pub struct InfoResponse {
     #[getset(get = "pub")]
     name: String,

diff --git a/bindings/java/native/src/types/treasury.rs b/bindings/java/native/src/types/treasury.rs
@@ -1,9 +1,9 @@
 // Copyright 2020 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use iota_wallet::message::{MessageId, TreasuryTransactionPayload as TreasuryTransactionPayloadRust};
+use iota_wallet::message::{TreasuryTransactionPayload as TreasuryTransactionPayloadRust};
 
-use iota::{Input, Output};
+use iota::Output;
 
 pub struct TreasuryTransactionPayload {
     payload: TreasuryTransactionPayloadRust,
@@ -16,13 +16,6 @@ impl From<TreasuryTransactionPayloadRust> for TreasuryTransactionPayload {
 }
 
 impl TreasuryTransactionPayload {
-    pub fn input(&self) -> MessageId {
-        if let Input::Treasury(payload) = self.payload.input() {
-            return payload.message_id().clone();
-        }
-        unreachable!()
-    }
-
     pub fn output(&self) -> u64 {
         if let Output::Treasury(payload) = self.payload.output() {
             return payload.amount();