Merge branch 'master-pre-merge' into rearchitect-repo

aionnetwork · Mar 12, 2019 · 3e5323f · 3e5323f
2 parents d8d47c8 + ff9820d
commit 3e5323f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/SyncStats.java b/modAionImpl/src/org/aion/zero/impl/sync/SyncStats.java
@@ -175,7 +175,7 @@ public void updateTotalRequestsToPeer(String nodeId, RequestType type) {
      *     requests made by the node
      */
     Map<String, Float> getPercentageOfRequestsToPeers() {
-        if (responsesEnabled) {
+        if (requestsEnabled) {
             requestsLock.lock();
 
             try {

diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainAccountStateBenchmark.java b/modAionImpl/test/org/aion/zero/impl/BlockchainAccountStateBenchmark.java
@@ -7,8 +7,11 @@
 import java.io.File;
 import java.math.BigInteger;
 import java.security.SecureRandom;
-import java.util.*;
-
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 import org.aion.types.Address;
 import org.aion.crypto.ECKey;
 import org.aion.crypto.HashUtil;