Organize imports

snowblossomcoin · Jun 1, 2018 · 2af472e · 2af472e
1 parent 5c76f94
commit 2af472e
Show file tree

Hide file tree

Showing 80 changed files with 346 additions and 750 deletions.
diff --git a/src/AddressSpecHash.java b/src/AddressSpecHash.java
@@ -1,10 +1,9 @@
 package snowblossom;
 
+import com.google.protobuf.ByteString;
 import org.junit.Assert;
-
-import snowblossom.trie.HashUtils;
 import snowblossom.trie.ByteStringComparator;
-import com.google.protobuf.ByteString;
+import snowblossom.trie.HashUtils;
 
 /**
  * Represents a basic hash that could be anything on

diff --git a/src/AddressUtil.java b/src/AddressUtil.java
@@ -1,22 +1,19 @@
 package snowblossom;
 
-import java.security.MessageDigest;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-
+import com.google.common.collect.ImmutableSet;
+import com.google.protobuf.ByteString;
+import org.junit.Assert;
 import snowblossom.proto.AddressSpec;
 import snowblossom.proto.SigSpec;
 import snowblossom.proto.WalletKeyPair;
-import com.google.protobuf.ByteString;
 
-import java.security.PublicKey;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
 import java.io.PrintStream;
-import java.util.Set;
-import com.google.common.collect.ImmutableSet;
-
-
-import org.junit.Assert;
+import java.security.MessageDigest;
+import java.security.PublicKey;
 import java.util.List;
+import java.util.Set;
 
 public class AddressUtil
 {

diff --git a/src/BlockForge.java b/src/BlockForge.java
@@ -1,23 +1,14 @@
 package snowblossom;
 
-import snowblossom.proto.Block;
-import snowblossom.proto.BlockHeader;
-import snowblossom.proto.BlockSummary;
-import snowblossom.proto.Transaction;
-import snowblossom.proto.TransactionInner;
-import snowblossom.proto.TransactionOutput;
-import snowblossom.proto.CoinbaseExtras;
-import java.util.Random;
-
 import com.google.protobuf.ByteString;
+import snowblossom.proto.*;
 import snowblossom.trie.HashUtils;
 
+import java.math.BigInteger;
+import java.security.MessageDigest;
 import java.util.LinkedList;
 import java.util.List;
 
-import java.security.MessageDigest;
-import java.math.BigInteger;
-
 /**
  * This class creates new blocks for miners to work on
  */

diff --git a/src/BlockIngestor.java b/src/BlockIngestor.java
@@ -1,26 +1,18 @@
 package snowblossom;
 
 import com.google.protobuf.ByteString;
-
+import snowblossom.db.DB;
 import snowblossom.proto.Block;
-import snowblossom.proto.BlockSummary;
 import snowblossom.proto.BlockHeader;
+import snowblossom.proto.BlockSummary;
 import snowblossom.proto.Transaction;
-
 import snowblossom.trie.HashUtils;
 
-import snowblossom.db.DB;
-import org.junit.Assert;
-
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.logging.Logger;
-import java.util.logging.Level;
-
-import java.math.BigInteger;
-
-import java.io.PrintStream;
-import java.io.FileOutputStream;
-import duckutil.Config;
 
 /**
  * This class takes in new blocks, validates them and stores them in the db.

diff --git a/src/BlockchainUtil.java b/src/BlockchainUtil.java
@@ -1,10 +1,10 @@
 package snowblossom;
 
-import java.nio.ByteBuffer;
 import com.google.protobuf.ByteString;
-
 import org.junit.Assert;
+
 import java.math.BigInteger;
+import java.nio.ByteBuffer;
 
 public class BlockchainUtil
 {

diff --git a/src/ChainHash.java b/src/ChainHash.java
@@ -1,10 +1,9 @@
 package snowblossom;
 
+import com.google.protobuf.ByteString;
 import org.junit.Assert;
-
-import snowblossom.trie.HashUtils;
 import snowblossom.trie.ByteStringComparator;
-import com.google.protobuf.ByteString;
+import snowblossom.trie.HashUtils;
 
 /**
  * Represents a basic hash that could be anything on

diff --git a/src/DigestUtil.java b/src/DigestUtil.java
@@ -1,14 +1,13 @@
 package snowblossom;
 
-import java.security.MessageDigest;
+import duckutil.TimeRecord;
+import duckutil.TimeRecordAuto;
+import org.junit.Assert;
 
+import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Assert;
-import duckutil.TimeRecordAuto;
-import duckutil.TimeRecord;
-
 
 public class DigestUtil
 {

diff --git a/src/Duck32.java b/src/Duck32.java
@@ -1,13 +1,13 @@
 package snowblossom;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.protobuf.ByteString;
-import java.security.MessageDigest;
+import org.junit.Assert;
+
 import java.math.BigInteger;
+import java.security.MessageDigest;
 import java.util.TreeMap;
 
-import org.junit.Assert;
-import com.google.common.collect.ImmutableMap;
-
 
 /**
  * Kinda like bech32, but with code I can actually understand.

diff --git a/src/HexUtil.java b/src/HexUtil.java
@@ -1,8 +1,7 @@
 package snowblossom;
 
-import org.apache.commons.codec.binary.Hex;
-
 import com.google.protobuf.ByteString;
+import org.apache.commons.codec.binary.Hex;
 
 public class HexUtil
 {

diff --git a/src/KeyUtil.java b/src/KeyUtil.java
@@ -1,36 +1,20 @@
 package snowblossom;
 
 import com.google.protobuf.ByteString;
-
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.DERSequenceParser;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import java.security.spec.ECGenParameterSpec;
-
+import org.bouncycastle.asn1.*;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
+import org.junit.Assert;
+import snowblossom.proto.WalletKeyPair;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
-
-import org.apache.commons.codec.binary.Hex;
-import java.security.PublicKey;
-import java.security.PrivateKey;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import snowblossom.proto.WalletKeyPair;
+import java.security.*;
+import java.security.spec.ECGenParameterSpec;
+import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.RSAKeyGenParameterSpec;
 import java.security.spec.X509EncodedKeySpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.ECGenParameterSpec;
 import java.util.ArrayList;
 
-import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
-
-import org.junit.Assert;
-
 public class KeyUtil
 {
   public static ByteString EC_SECP256K1_PREFIX= HexUtil.stringToHex("3036301006072a8648ce3d020106052b8104000a032200");

diff --git a/src/LogSetup.java b/src/LogSetup.java
@@ -1,13 +1,12 @@
 package snowblossom;
 
-import java.util.logging.Logger;
-import java.util.logging.LogManager;
-import java.util.logging.Level;
+import duckutil.Config;
+
+import java.io.FileInputStream;
 import java.util.Enumeration;
 import java.util.logging.Handler;
-import java.io.FileInputStream;
-
-import duckutil.Config;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
 
 public class LogSetup
 {

diff --git a/src/MemPool.java b/src/MemPool.java
@@ -1,33 +1,21 @@
 package snowblossom;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.TreeMultimap;
-
+import com.google.protobuf.ByteString;
+import duckutil.TimeRecord;
+import org.junit.Assert;
 import snowblossom.proto.Transaction;
+import snowblossom.proto.TransactionInner;
 import snowblossom.proto.TransactionInput;
 import snowblossom.proto.TransactionOutput;
-import snowblossom.proto.TransactionInner;
-import snowblossom.proto.BlockSummary;
 import snowblossom.trie.HashedTrie;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Collection;
-import java.util.TreeSet;
-import java.util.Random;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.protobuf.ByteString;
-import com.google.common.collect.HashMultimap;
 
-import org.junit.Assert;
-import java.util.logging.Logger;
+import java.util.*;
 import java.util.logging.Level;
-import duckutil.TimeRecord;
+import java.util.logging.Logger;
 
 
 

diff --git a/src/NetUtil.java b/src/NetUtil.java
@@ -1,7 +1,7 @@
 package snowblossom;
 
-import java.util.Scanner;
 import java.net.URL;
+import java.util.Scanner;
 
 public class NetUtil
 {

diff --git a/src/NetworkParams.java b/src/NetworkParams.java
@@ -1,17 +1,15 @@
 package snowblossom;
 
 import com.google.common.collect.ImmutableMap;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.List;
-
 import com.google.protobuf.ByteString;
+import duckutil.Config;
 
-import java.util.logging.Logger;
-import java.util.logging.Level;
 import java.math.BigInteger;
-
-import duckutil.Config;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public abstract class NetworkParams
 {

diff --git a/src/NetworkParamsProd.java b/src/NetworkParamsProd.java
@@ -1,14 +1,14 @@
 package snowblossom;
 
 
-import java.util.Map;
-import java.util.TreeMap;
-
-import java.util.List;
 import com.google.common.collect.ImmutableList;
-import java.math.BigInteger;
 import com.google.protobuf.ByteString;
 
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
 public class NetworkParamsProd extends NetworkParams
 {
   @Override

diff --git a/src/NetworkParamsRegtest.java b/src/NetworkParamsRegtest.java
@@ -1,13 +1,12 @@
 package snowblossom;
 
 
-import java.util.Map;
-import java.util.TreeMap;
-
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
+
 import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 
 public class NetworkParamsRegtest extends NetworkParams

diff --git a/src/NetworkParamsTestnet.java b/src/NetworkParamsTestnet.java
@@ -1,13 +1,13 @@
 package snowblossom;
 
 
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.ByteString;
+
 import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 
 public class NetworkParamsTestnet extends NetworkParams

diff --git a/src/PRNGStream.java b/src/PRNGStream.java
@@ -1,14 +1,13 @@
 package snowblossom;
 
 import org.apache.commons.math3.random.AbstractWell;
-import org.apache.commons.math3.random.Well1024a;
 import org.apache.commons.math3.random.Well44497b;
 
-import java.util.TreeMap;
 import java.nio.ByteBuffer;
-import java.security.Security;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.Security;
+import java.util.TreeMap;
 
  /** not thread safe */
   public class PRNGStream