From 6f500681e894d2762fe8880bb71f1d6f79bd95af Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Tue, 18 Aug 2020 11:35:15 +0200
Subject: [PATCH] [enh] BMA Peer bean: add 'lastContact' and 'hash'
---
.../core/client/model/bma/NetworkPeers.java | 22 +++++++++++++++++++
.../duniter/core/util/merkle/MerkleTree.java | 1 +
2 files changed, 23 insertions(+)
diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/NetworkPeers.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/NetworkPeers.java
index 2cdff5c5..c69cbf56 100644
--- a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/NetworkPeers.java
+++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/NetworkPeers.java
@@ -43,6 +43,8 @@ public class NetworkPeers implements Serializable {
public static class Peer extends NetworkPeering implements Serializable {
public Long firstDown;
public Long lastTry;
+ public Long lastContact;
+ public String hash;
@JsonGetter("first_down")
public Long getFirstDown() {
@@ -64,6 +66,26 @@ public class NetworkPeers implements Serializable {
this.lastTry = lastTry;
}
+ @JsonGetter("lastContact")
+ public Long getLastContact() {
+ return lastContact;
+ }
+
+ @JsonSetter("lastContact")
+ public void setLastContact(Long lastContact) {
+ this.lastContact = lastContact;
+ }
+
+ @JsonIgnore
+ public String getHash() {
+ return hash;
+ }
+
+ @JsonIgnore
+ public void setHash(String hash {
+ this.hash = hash;
+ }
+
@Override
@JsonIgnore
public String getRaw() {
diff --git a/duniter4j-core-shared/src/main/java/org/duniter/core/util/merkle/MerkleTree.java b/duniter4j-core-shared/src/main/java/org/duniter/core/util/merkle/MerkleTree.java
index 9aeb8a1f..869ba7ba 100644
--- a/duniter4j-core-shared/src/main/java/org/duniter/core/util/merkle/MerkleTree.java
+++ b/duniter4j-core-shared/src/main/java/org/duniter/core/util/merkle/MerkleTree.java
@@ -84,6 +84,7 @@ public class MerkleTree {
}
+
private void feed(String str) {
if(StringUtils.isNotBlank(str) && regexp.test(str)){
// Push leaf without hashing it since it is already a hash
--
GitLab