From ef546b4557ff98d0f447908ab5cb7f4737f3eaf3 Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Thu, 2 Jul 2015 22:07:46 +0200 Subject: [PATCH] Remove leveldbjni in android --- .../android/datasource/LevelDbDataSource.java | 4 +--- .../src/main/resources/system.properties | 18 +++++++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ethereumj-core-android/src/main/java/org/ethereum/android/datasource/LevelDbDataSource.java b/ethereumj-core-android/src/main/java/org/ethereum/android/datasource/LevelDbDataSource.java index d80f97ec..734f91ff 100644 --- a/ethereumj-core-android/src/main/java/org/ethereum/android/datasource/LevelDbDataSource.java +++ b/ethereumj-core-android/src/main/java/org/ethereum/android/datasource/LevelDbDataSource.java @@ -19,9 +19,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import static org.fusesource.leveldbjni.JniDBFactory.factory; - -//import static org.iq80.leveldb.impl.Iq80DBFactory.factory; +import static org.iq80.leveldb.impl.Iq80DBFactory.factory; /** * @author Roman Mandeleil diff --git a/ethereumj-core/src/main/resources/system.properties b/ethereumj-core/src/main/resources/system.properties index dd59d560..de23b2ba 100644 --- a/ethereumj-core/src/main/resources/system.properties +++ b/ethereumj-core/src/main/resources/system.properties @@ -27,13 +27,13 @@ peer.discovery.ip.list = poc-7.ethdev.com:30303,\ #peer.active.nodeid = 4e94cab3e9a85a22b59f69a2ad1f10ff1eaff5f8d94a0025df18c936a687b6ac99b3fb655677e8b9d08087319bca69ad2ab0b80a9d0ab47296bdc54c8cb09853 -peer.active.ip = 139.162.13.89 -peer.active.port = 30303 -peer.active.nodeid = bf01b54b6bc7faa203286dfb8359ce11d7b1fe822968fb4991f508d6f5a36ab7d9ae8af9b0d61c0467fb08567e0fb71cfb9925a370b69f9ede97927db473d1f5 - -#peer.active.ip = 192.168.122.90 +#peer.active.ip = 139.162.13.89 #peer.active.port = 30303 -#peer.active.nodeid = 4a531abc51448e584faae944d7e244e3f1ac6a629579a937b8c16ed98efb2a7aff29f6ab8c73c60041d3b078533bca842ec61d9a85f12ea9e6c3c7657e85f062 +#peer.active.nodeid = bf01b54b6bc7faa203286dfb8359ce11d7b1fe822968fb4991f508d6f5a36ab7d9ae8af9b0d61c0467fb08567e0fb71cfb9925a370b69f9ede97927db473d1f5 + +peer.active.ip = 192.168.122.90 +peer.active.port = 30303 +peer.active.nodeid = 4a531abc51448e584faae944d7e244e3f1ac6a629579a937b8c16ed98efb2a7aff29f6ab8c73c60041d3b078533bca842ec61d9a85f12ea9e6c3c7657e85f062 # peer.active.ip = 52.4.40.229 # peer.active.port = 30303 @@ -64,19 +64,19 @@ peer.discovery.workers = 3 # connection timeout for trying to # connect to a peer [seconds] -peer.connection.timeout = 300 +peer.connection.timeout = 2 # the time we wait to the network # to approve the transaction, the # transaction got approved when # include into a transactions msg # retrieved from the peer [seconds] -transaction.approve.timeout = 300 +transaction.approve.timeout = 15 # the parameter specifies how much # time we will wait for a message # to come before closing the channel -peer.channel.read.timeout = 300 +peer.channel.read.timeout = 30 # default directory where we keep # basic Serpent samples relative