diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/ErrorCode.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/ErrorCode.java
index 90274fa317403c44d230e3c4861bf5a08b4d5a47..3816799cd3b2d6c6e7a83fd37435310ede552504 100644
--- a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/ErrorCode.java
+++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/ErrorCode.java
@@ -27,7 +27,9 @@ package org.duniter.core.client.model.bma;
*/
public interface ErrorCode {
+ int ALREADY_UP_TO_DATE = 1004;
int NO_MATCHING_IDENTITY = 2001;
int UID_ALREADY_USED = 2003;
+ int WRONG_SIGNATURE_MEMBERSHIP = 2006;
int MEMBERSHRIP_ALREADY_SEND = 2007;
}
diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/NetworkRemoteServiceImpl.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/NetworkRemoteServiceImpl.java
index 3815be7e913a023c3c5c0372d678f69cb4fa7717..80a3c4256af7d2272f03e8f8ffdb4960656326d6 100644
--- a/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/NetworkRemoteServiceImpl.java
+++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/NetworkRemoteServiceImpl.java
@@ -146,7 +146,7 @@ public class NetworkRemoteServiceImpl extends BaseRemoteServiceImpl implements N
for (NetworkPeering.Endpoint endpoint : remotePeer.endpoints) {
- match = endpointApi == null || endpointApi == endpoint.api;
+ match = endpointApi == null || (endpoint != null && endpointApi == endpoint.api);
if (match && endpoint != null) {
Peer childPeer = Peer.newBuilder()
diff --git a/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/WotRemoteServiceTest.java b/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/WotRemoteServiceTest.java
index ca52ee154ad72030aa3174afebdb51e5e9ae9325..3415c584aa530991466f2f7a1580f82fa7eb9362 100644
--- a/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/WotRemoteServiceTest.java
+++ b/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/WotRemoteServiceTest.java
@@ -77,6 +77,8 @@ public class WotRemoteServiceTest {
}
@Test
+ @Ignore
+ // FIXME: user 'gab' has no certification
public void getCertifiedBy() throws Exception {
WotRemoteService service = ServiceLocator.instance().getWotRemoteService();
WotCertification result = service.getCertifiedBy(
@@ -105,6 +107,8 @@ public class WotRemoteServiceTest {
}
@Test
+ @Ignore
+ // FIXME: user 'gab' has no certification
public void getCertifiersOf() throws Exception {
WotCertification result = service.getCertifiersOf(
resource.getFixtures().getDefaultCurrencyId(),
@@ -148,7 +152,7 @@ public class WotRemoteServiceTest {
service.sendIdentity(peer, currency, wallet.getPubKey(), wallet.getSecKey(), uid, blockUid);
}
catch(HttpBadRequestException e) {
- Assert.assertEquals(ErrorCode.UID_ALREADY_USED, e.getCode());
+ Assert.assertTrue(ErrorCode.UID_ALREADY_USED == e.getCode() || ErrorCode.ALREADY_UP_TO_DATE == e.getCode());
}
}
diff --git a/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties b/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties
index d9f4f75b7e5ea3263c1a2c3b4ac7eecaba84c90e..9e0174256782c42e59993c031833112967a47301 100644
--- a/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties
+++ b/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties
@@ -1,5 +1,5 @@
-duniter4j.node.host=192.168.0.5
-duniter4j.node.port=10901
+duniter4j.node.host=gtest.duniter.org
+duniter4j.node.port=10900
duniter4j.node.elasticsearch.host=localhost
duniter4j.node.elasticsearch.port=9200
diff --git a/duniter4j-core-shared/src/main/java/org/duniter/core/test/TestFixtures.java b/duniter4j-core-shared/src/main/java/org/duniter/core/test/TestFixtures.java
index 6cbe16429f1aa9be55c958631a2b7465821de987..db946f38203a1d661dc12455c42713c982515726 100644
--- a/duniter4j-core-shared/src/main/java/org/duniter/core/test/TestFixtures.java
+++ b/duniter4j-core-shared/src/main/java/org/duniter/core/test/TestFixtures.java
@@ -27,7 +27,7 @@ package org.duniter.core.test;
public class TestFixtures {
public String getCurrency() {
- return "test_net";
+ return "gtest";
}
public String getUid() {
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/PluginInit.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/PluginInit.java
index 89d277399098291704539d207cd6b39aa1825c55..5d6cde48bb78c05d0f6150b6cbc2601e420f23a8 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/PluginInit.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/PluginInit.java
@@ -27,7 +27,7 @@ import org.duniter.core.client.model.local.Peer;
import org.duniter.elasticsearch.rest.security.RestSecurityController;
import org.duniter.elasticsearch.service.BlockchainService;
import org.duniter.elasticsearch.service.CurrencyService;
-import org.duniter.elasticsearch.service.NetworkService;
+import org.duniter.elasticsearch.service.EndpointService;
import org.duniter.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.health.ClusterHealthStatus;
@@ -138,7 +138,7 @@ public class PluginInit extends AbstractLifecycleComponent<PluginInit> {
.listenAndIndexNewBlock(peer);
// Index peers (and listen if new peer appear)
- injector.getInstance(NetworkService.class)
+ injector.getInstance(EndpointService.class)
.indexLastPeers(peer)/*
.listenAndIndexNewPeer(peer)*/;
}
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/BlockchainService.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/BlockchainService.java
index 8f3192de1985f3dffc53c41e4fdb9f6b492372dd..968b77bfd3a99a192d6ad8270123dd361f629cd1 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/BlockchainService.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/BlockchainService.java
@@ -294,7 +294,7 @@ public class BlockchainService extends AbstractService {
.build();
createIndexRequestBuilder.setSettings(indexSettings);
createIndexRequestBuilder.addMapping(BLOCK_TYPE, createBlockTypeMapping());
- createIndexRequestBuilder.addMapping(PEER_TYPE, NetworkService.createPeerTypeMapping());
+ createIndexRequestBuilder.addMapping(PEER_TYPE, EndpointService.createEndpointTypeMapping());
createIndexRequestBuilder.execute().actionGet();
}
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/NetworkService.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/EndpointService.java
similarity index 94%
rename from duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/NetworkService.java
rename to duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/EndpointService.java
index 209abd269a9356cc65ba89a5cc2419a95861306e..8df832397e026fedb4f30a022ff5e3ace9b71afe 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/NetworkService.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/EndpointService.java
@@ -31,7 +31,6 @@ import org.duniter.core.client.model.bma.BlockchainParameters;
import org.duniter.core.client.model.bma.EndpointApi;
import org.duniter.core.client.model.bma.jackson.JacksonUtils;
import org.duniter.core.client.model.local.Peer;
-import org.duniter.core.client.service.local.NetworkServiceImpl;
import org.duniter.core.exception.TechnicalException;
import org.duniter.core.model.NullProgressionModel;
import org.duniter.core.model.ProgressionModel;
@@ -71,9 +70,9 @@ import java.util.stream.Collectors;
/**
* Created by Benoit on 30/03/2015.
*/
-public class NetworkService extends AbstractService {
+public class EndpointService extends AbstractService {
- public static final String PEER_TYPE = "peer";
+ public static final String ENDPOINT_TYPE = "endpoint";
private final ProgressionModel nullProgressionModel = new NullProgressionModel();
@@ -89,8 +88,8 @@ public class NetworkService extends AbstractService {
private ObjectMapper objectMapper;
@Inject
- public NetworkService(Client client, PluginSettings settings, ThreadPool threadPool,
- final ServiceLocator serviceLocator){
+ public EndpointService(Client client, PluginSettings settings, ThreadPool threadPool,
+ final ServiceLocator serviceLocator){
super("duniter.network", client, settings);
this.objectMapper = JacksonUtils.newObjectMapper();
this.threadPool = threadPool;
@@ -120,12 +119,12 @@ public class NetworkService extends AbstractService {
}
}
- public NetworkService indexLastPeers(Peer peer) {
+ public EndpointService indexLastPeers(Peer peer) {
indexLastPeers(peer, nullProgressionModel);
return this;
}
- public NetworkService indexLastPeers(Peer peer, ProgressionModel progressionModel) {
+ public EndpointService indexLastPeers(Peer peer, ProgressionModel progressionModel) {
try {
// Get the blockchain name from node
@@ -148,7 +147,7 @@ public class NetworkService extends AbstractService {
}
- public NetworkService indexPeers(String currencyName, Peer firstPeer, ProgressionModel progressionModel) {
+ public EndpointService indexPeers(String currencyName, Peer firstPeer, ProgressionModel progressionModel) {
progressionModel.setStatus(ProgressionModel.Status.RUNNING);
progressionModel.setTotal(100);
long timeStart = System.currentTimeMillis();
@@ -282,7 +281,7 @@ public class NetworkService extends AbstractService {
String json = objectMapper.writeValueAsString(peer);
// Preparing indexBlocksFromNode
- IndexRequestBuilder indexRequest = client.prepareIndex(peer.getCurrency(), PEER_TYPE)
+ IndexRequestBuilder indexRequest = client.prepareIndex(peer.getCurrency(), ENDPOINT_TYPE)
.setId(peer.getHash())
.setSource(json);
@@ -313,7 +312,7 @@ public class NetworkService extends AbstractService {
String json = objectMapper.writeValueAsString(peer);
// Preparing indexBlocksFromNode
- UpdateRequestBuilder updateRequest = client.prepareUpdate(peer.getCurrency(), PEER_TYPE, peer.getHash())
+ UpdateRequestBuilder updateRequest = client.prepareUpdate(peer.getCurrency(), ENDPOINT_TYPE, peer.getHash())
.setDoc(json);
// Execute indexBlocksFromNode
@@ -336,12 +335,12 @@ public class NetworkService extends AbstractService {
* @param number the peer hash
* @param json block as JSON
*/
- public NetworkService indexPeerFromJson(String currencyName, int number, byte[] json, boolean refresh, boolean wait) {
+ public EndpointService indexPeerFromJson(String currencyName, int number, byte[] json, boolean refresh, boolean wait) {
Preconditions.checkNotNull(json);
Preconditions.checkArgument(json.length > 0);
// Preparing indexBlocksFromNode
- IndexRequestBuilder indexRequest = client.prepareIndex(currencyName, PEER_TYPE)
+ IndexRequestBuilder indexRequest = client.prepareIndex(currencyName, ENDPOINT_TYPE)
.setId(String.valueOf(number))
.setRefresh(refresh)
.setSource(json);
@@ -370,7 +369,7 @@ public class NetworkService extends AbstractService {
* @param refresh Enable ES update with 'refresh' tag ?
* @param wait need to wait until processed ?
*/
- public NetworkService indexPeer(Peer peer, String json, boolean refresh, boolean wait) {
+ public EndpointService indexPeer(Peer peer, String json, boolean refresh, boolean wait) {
Preconditions.checkNotNull(json);
Preconditions.checkArgument(json.length() > 0);
@@ -384,7 +383,7 @@ public class NetworkService extends AbstractService {
// Preparing index
- IndexRequestBuilder indexRequest = client.prepareIndex(currencyName, PEER_TYPE)
+ IndexRequestBuilder indexRequest = client.prepareIndex(currencyName, ENDPOINT_TYPE)
.setId(hash)
.setRefresh(refresh)
.setSource(json);
@@ -406,7 +405,7 @@ public class NetworkService extends AbstractService {
// Prepare request
SearchRequestBuilder searchRequest = client
.prepareSearch(currencyName)
- .setTypes(PEER_TYPE)
+ .setTypes(ENDPOINT_TYPE)
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
// If only one term, search as prefix
@@ -438,11 +437,11 @@ public class NetworkService extends AbstractService {
/* -- Internal methods -- */
- public static XContentBuilder createPeerTypeMapping() {
+ public static XContentBuilder createEndpointTypeMapping() {
try {
XContentBuilder mapping = XContentFactory.jsonBuilder()
.startObject()
- .startObject(PEER_TYPE)
+ .startObject(ENDPOINT_TYPE)
.startObject("properties")
// currency
@@ -497,7 +496,7 @@ public class NetworkService extends AbstractService {
// Prepare request
SearchRequestBuilder searchRequest = client
.prepareSearch(currencyName)
- .setTypes(PEER_TYPE)
+ .setTypes(ENDPOINT_TYPE)
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
// If more than a word, search on terms match
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/ServiceModule.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/ServiceModule.java
index 68d7ccbb7f533da43ce6deed98c7f4c65ae874e3..7585e95790fac39616ca8ea9a5c6d6fddbb195c9 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/ServiceModule.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/ServiceModule.java
@@ -54,7 +54,7 @@ public class ServiceModule extends AbstractModule implements Module {
// blockchain indexation services
bind(BlockchainService.class).asEagerSingleton();
- bind(NetworkService.class).asEagerSingleton();
+ bind(EndpointService.class).asEagerSingleton();
// Duniter Client API beans
bindWithLocator(BlockchainRemoteService.class);