update guava

ethereum · Apr 3, 2018 · 350801a · 350801a
1 parent 4ca9837
commit 350801a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/ethereumj-core/build.gradle b/ethereumj-core/build.gradle
@@ -120,6 +120,8 @@ dependencies {
 
     compile "org.ethereum:solcJ-all:0.4.19"                  // Solidity Compiler win/mac/linux binaries
 
+    compile "com.google.guava:guava:24.1-jre"
+
     compile "com.cedarsoftware:java-util:1.8.0" // for deep equals
     compile "org.javassist:javassist:3.15.0-GA"
     compile "org.slf4j:slf4j-api:${slf4jVersion}"

diff --git a/ethereumj-core/src/main/java/org/ethereum/mine/AnyFuture.java b/ethereumj-core/src/main/java/org/ethereum/mine/AnyFuture.java
@@ -37,7 +37,7 @@ public class AnyFuture<V> extends AbstractFuture<V> {
     public synchronized void add(final ListenableFuture<V> f) {
         if (isCancelled() || isDone()) return;
 
-        f.addListener(() -> futureCompleted(f),  MoreExecutors.sameThreadExecutor());
+        f.addListener(() -> futureCompleted(f),  MoreExecutors.directExecutor());
         futures.add(f);
     }
 

diff --git a/ethereumj-core/src/main/java/org/ethereum/mine/BlockMiner.java b/ethereumj-core/src/main/java/org/ethereum/mine/BlockMiner.java
@@ -279,7 +279,7 @@ protected void restartMining() {
                     } catch (Exception e) {
                         logger.warn("Exception during mining: ", e);
                     }
-                }, MoreExecutors.sameThreadExecutor());
+                }, MoreExecutors.directExecutor());
             }
         }
         fireBlockStarted(newMiningBlock);

diff --git a/ethereumj-core/src/test/java/org/ethereum/mine/FutureTest.java b/ethereumj-core/src/test/java/org/ethereum/mine/FutureTest.java
@@ -52,7 +52,7 @@ public void interruptTest() throws InterruptedException {
             } catch (ExecutionException e) {
                 throw new RuntimeException(e);
             }
-        }, MoreExecutors.sameThreadExecutor());
+        }, MoreExecutors.directExecutor());
 
         Thread.sleep(1000);
         future.cancel(true);