Merge branch 'vovchyk/snap/pow-weighted-peer-selection' into vovchyk/snap/fetch-leaves-only

Author: fmacleal

rskj-core/src/main/java/co/rsk/net/sync/PeersInformation.java

@@ -31,7 +31,14 @@
 
 import java.security.SecureRandom;
 import java.time.Instant;
-import java.util.*;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

rskj-core/src/test/java/co/rsk/net/messages/SnapStateChunkV2RequestMessageTest.java

@@ -24,8 +24,14 @@
 
 import java.util.Arrays;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 class SnapStateChunkV2RequestMessageTest {
 
@@ -271,4 +277,4 @@ void testNegativeId() {
         assertArrayEquals(blockHash, message.getBlockHash());
         assertArrayEquals(fromKey, message.getFromKey());
     }
-} 
+}

rskj-core/src/test/java/co/rsk/net/messages/SnapStateChunkV2ResponseMessageTest.java

@@ -25,8 +25,15 @@
 
 import java.util.LinkedHashMap;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 class SnapStateChunkV2ResponseMessageTest {
 
@@ -232,4 +239,4 @@ private TrieChunk createLargeTrieChunk() {
 
         return new TrieChunk(keyValues, TrieChunk.Proof.EMPTY);
     }
-} 
+}

rskj-core/src/test/java/co/rsk/net/sync/SnapCapablePeerSelectionSyncStateTest.java

@@ -37,11 +37,24 @@
 import java.math.BigInteger;
 import java.net.UnknownHostException;
 import java.time.Duration;
-import java.util.*;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 class SnapCapablePeerSelectionSyncStateTest {
 
@@ -459,4 +472,4 @@ private List<BlockHeader> createValidHeaderChain(int count) {
 
         return headers;
     }
-} 
+}

rskj-core/src/test/java/co/rsk/trie/TrieChunkIteratorTest.java

@@ -27,7 +27,11 @@
 import java.util.Set;
 
 import static org.bouncycastle.util.encoders.Hex.decode;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class TrieChunkIteratorTest {
 
@@ -305,4 +309,4 @@ private Trie buildLargeTrie() {
 
         return trie;
     }
-} 
+}

rskj-core/src/test/java/co/rsk/trie/TrieChunkTest.java

@@ -25,9 +25,19 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class TrieChunkTest {
 
@@ -276,4 +286,4 @@ void testProofFromFactory() {
         // This tests the factory method works without throwing exceptions
         assertNotNull(proofOpt);
     }
-} 
+}

rskj-core/src/test/java/co/rsk/trie/TrieGetNextChunkTest.java

@@ -22,7 +22,11 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class TrieGetNextChunkTest {
 
@@ -264,4 +268,4 @@ void testGetNextChunk_IdenticalSequentialCalls() {
             assertEquals(chunk1.keyValues().size(), chunk2.keyValues().size());
         }
     }
-} 
+}