optimize imports

trueinsider · Aug 14, 2018 · f50d788 · f50d788
1 parent 0ad1dc2
commit f50d788
Show file tree

Hide file tree

Showing 95 changed files with 182 additions and 347 deletions.
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
diff --git a/src/main/java/com/github/neo/core/NeoRpc.kt b/src/main/java/com/github/neo/core/NeoRpc.kt
@@ -1,16 +1,12 @@
 package com.github.neo.core
 
 import com.alibaba.fastjson.JSON
-import com.github.neo.core.NeoRpc.call
-import com.github.ontio.common.ErrorCode
 import com.github.ontio.network.exception.RpcException
-
-import java.io.IOException
 import java.io.InputStreamReader
 import java.io.OutputStreamWriter
 import java.net.HttpURLConnection
 import java.net.URL
-import java.util.HashMap
+import java.util.*
 
 object NeoRpc {
 

diff --git a/src/main/java/com/github/neo/core/Program.kt b/src/main/java/com/github/neo/core/Program.kt
@@ -5,8 +5,6 @@ import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
 import com.github.ontio.io.Serializable
 
-import java.io.IOException
-
 /**
  *
  */

diff --git a/src/main/java/com/github/neo/core/SmartContract.kt b/src/main/java/com/github/neo/core/SmartContract.kt
@@ -3,15 +3,13 @@ package com.github.neo.core
 
 import com.alibaba.fastjson.JSON
 import com.github.neo.core.transaction.InvocationTransaction
+import com.github.neo.core.transaction.PublishTransaction
 import com.github.ontio.common.Fixed8
 import com.github.ontio.common.Helper
 import com.github.ontio.core.scripts.ScriptBuilder
-import com.github.neo.core.transaction.PublishTransaction
 import com.github.ontio.smartcontract.neovm.abi.AbiFunction
-
 import java.math.BigInteger
-import java.util.ArrayList
-import java.util.UUID
+import java.util.*
 
 /**
  *

diff --git a/src/main/java/com/github/neo/core/TransactionAttribute.kt b/src/main/java/com/github/neo/core/TransactionAttribute.kt
@@ -4,9 +4,8 @@ package com.github.neo.core
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
 import com.github.ontio.io.Serializable
-
 import java.io.IOException
-import java.util.Arrays
+import java.util.*
 
 /**
  *

diff --git a/src/main/java/com/github/neo/core/TransactionInput.kt b/src/main/java/com/github/neo/core/TransactionInput.kt
@@ -6,8 +6,6 @@ import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
 import com.github.ontio.io.Serializable
 
-import java.io.IOException
-
 /**
  *
  */

diff --git a/src/main/java/com/github/neo/core/transaction/InvocationTransaction.kt b/src/main/java/com/github/neo/core/transaction/InvocationTransaction.kt
@@ -10,9 +10,6 @@ import com.github.ontio.core.transaction.TransactionType
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
 
-
-import java.io.IOException
-
 class InvocationTransaction(
         version: Byte,
         attributes: Array<TransactionAttribute>,

diff --git a/src/main/java/com/github/neo/core/transaction/PublishTransaction.kt b/src/main/java/com/github/neo/core/transaction/PublishTransaction.kt
@@ -9,10 +9,7 @@ import com.github.ontio.common.Address
 import com.github.ontio.core.transaction.TransactionType
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
-
-import java.io.IOException
-import java.util.ArrayList
-import java.util.Arrays
+import java.util.*
 
 class PublishTransaction(
         version: Byte,

diff --git a/src/main/java/com/github/neo/core/transaction/TransactionNeo.kt b/src/main/java/com/github/neo/core/transaction/TransactionNeo.kt
@@ -2,17 +2,16 @@ package com.github.neo.core.transaction
 
 
 import com.github.neo.core.Program
+import com.github.neo.core.TransactionAttribute
 import com.github.neo.core.TransactionInput
+import com.github.neo.core.TransactionOutput
 import com.github.ontio.account.Account
 import com.github.ontio.core.Inventory
 import com.github.ontio.core.InventoryType
 import com.github.ontio.core.transaction.TransactionType
 import com.github.ontio.crypto.SignatureScheme
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
-import com.github.neo.core.TransactionAttribute
-import com.github.neo.core.TransactionOutput
-
 import java.io.ByteArrayInputStream
 import java.io.IOException
 import java.util.*

diff --git a/src/main/java/com/github/ontio/OntSdk.kt b/src/main/java/com/github/ontio/OntSdk.kt
@@ -19,26 +19,20 @@
 
 package com.github.ontio
 
-import com.github.ontio.OntSdk.defaultSignScheme
-import com.github.ontio.OntSdk.rpc
-import com.github.ontio.OntSdk.walletMgr
 import com.github.ontio.account.Account
 import com.github.ontio.common.Common
 import com.github.ontio.common.ErrorCode
 import com.github.ontio.core.DataSignature
+import com.github.ontio.core.asset.Sig
 import com.github.ontio.core.program.Program
 import com.github.ontio.core.transaction.Transaction
-import com.github.ontio.core.asset.Sig
 import com.github.ontio.crypto.Digest
 import com.github.ontio.crypto.SignatureScheme
 import com.github.ontio.sdk.exception.SDKException
-import com.github.ontio.sdk.manager.*
-import com.github.ontio.smartcontract.NativeVm
-import com.github.ontio.smartcontract.NeoVm
-import com.github.ontio.smartcontract.Vm
-import com.github.ontio.smartcontract.WasmVm
-
-import java.util.Arrays
+import com.github.ontio.sdk.manager.ConnectMgr
+import com.github.ontio.sdk.manager.SignServer
+import com.github.ontio.sdk.manager.WalletMgr
+import java.util.*
 
 /**
  * Ont Sdk

diff --git a/src/main/java/com/github/ontio/account/Account.kt b/src/main/java/com/github/ontio/account/Account.kt
@@ -19,13 +19,11 @@
 
 package com.github.ontio.account
 
+import com.github.ontio.common.Address
 import com.github.ontio.common.ErrorCode
-import com.github.ontio.crypto.*
 import com.github.ontio.common.Helper
-import com.github.ontio.common.Address
-import com.github.ontio.crypto.Base58
+import com.github.ontio.crypto.*
 import com.github.ontio.crypto.Signature
-import com.github.ontio.crypto.Digest
 import com.github.ontio.sdk.exception.SDKException
 import org.bouncycastle.crypto.generators.SCrypt
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey
@@ -36,18 +34,16 @@ import org.bouncycastle.jce.ECPointUtil
 import org.bouncycastle.jce.provider.BouncyCastleProvider
 import org.bouncycastle.jce.spec.ECNamedCurveSpec
 import org.bouncycastle.util.Strings
-
-import javax.crypto.Cipher
-import javax.crypto.spec.GCMParameterSpec
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
 import java.io.ByteArrayOutputStream
 import java.math.BigInteger
 import java.nio.charset.StandardCharsets
 import java.security.*
 import java.security.spec.*
-import java.util.Arrays
-import java.util.Base64
+import java.util.*
+import javax.crypto.Cipher
+import javax.crypto.spec.GCMParameterSpec
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
 import kotlin.experimental.xor
 
 class Account {

diff --git a/src/main/java/com/github/ontio/common/Common.kt b/src/main/java/com/github/ontio/common/Common.kt
@@ -20,9 +20,8 @@
 package com.github.ontio.common
 
 import com.github.ontio.crypto.ECC
-
 import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.*
 
 abstract class Common : AutoCloseable {
     companion object {

diff --git a/src/main/java/com/github/ontio/common/Fixed8.kt b/src/main/java/com/github/ontio/common/Fixed8.kt
@@ -19,13 +19,10 @@
 
 package com.github.ontio.common
 
-import java.io.IOException
-import java.math.BigDecimal
-import java.util.function.Function
-
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
 import com.github.ontio.io.Serializable
+import java.math.BigDecimal
 
 /**
  *

diff --git a/src/main/java/com/github/ontio/common/Helper.kt b/src/main/java/com/github/ontio/common/Helper.kt
@@ -21,8 +21,7 @@ package com.github.ontio.common
 
 import java.math.BigInteger
 import java.text.SimpleDateFormat
-import java.util.Arrays
-import java.util.Date
+import java.util.*
 import kotlin.experimental.inv
 
 /**

diff --git a/src/main/java/com/github/ontio/common/UIntBase.kt b/src/main/java/com/github/ontio/common/UIntBase.kt
@@ -19,13 +19,12 @@
 
 package com.github.ontio.common
 
-import java.io.IOException
-import java.nio.*
-import java.util.Arrays
-
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
 import com.github.ontio.io.Serializable
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.util.*
 
 /**
  * Custom type base abstract class, it defines the storage and the serialization

diff --git a/src/main/java/com/github/ontio/common/WalletQR.kt b/src/main/java/com/github/ontio/common/WalletQR.kt
@@ -3,9 +3,11 @@ package com.github.ontio.common
 import com.alibaba.fastjson.JSON
 import com.github.ontio.account.Account.Companion.getGcmDecodedPrivateKey
 import com.github.ontio.crypto.SignatureScheme
-import com.github.ontio.sdk.wallet.*
-
-import java.util.Base64
+import com.github.ontio.sdk.wallet.Account
+import com.github.ontio.sdk.wallet.Identity
+import com.github.ontio.sdk.wallet.Scrypt
+import com.github.ontio.sdk.wallet.Wallet
+import java.util.*
 
 object WalletQR {
     fun exportIdentityQRCode(walletFile: Wallet, identity: Identity): Map<*, *> {

diff --git a/src/main/java/com/github/ontio/core/DataSignature.kt b/src/main/java/com/github/ontio/core/DataSignature.kt
@@ -26,8 +26,6 @@ import com.github.ontio.crypto.SignatureScheme
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
 
-import java.io.IOException
-
 class DataSignature : Signable {
     private lateinit var scheme: SignatureScheme
     private lateinit var account: Account

diff --git a/src/main/java/com/github/ontio/core/Signable.kt b/src/main/java/com/github/ontio/core/Signable.kt
@@ -19,16 +19,15 @@
 
 package com.github.ontio.core
 
-import java.io.ByteArrayOutputStream
-import java.io.IOException
 import com.github.ontio.account.Account
+import com.github.ontio.common.Address
 import com.github.ontio.crypto.Digest
 import com.github.ontio.crypto.SignatureScheme
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
 import com.github.ontio.io.Serializable
-
-import com.github.ontio.common.Address
+import java.io.ByteArrayOutputStream
+import java.io.IOException
 
 interface Signable : Serializable {
     val addressU160ForVerifying: Array<Address>?

diff --git a/src/main/java/com/github/ontio/core/asset/Contract.kt b/src/main/java/com/github/ontio/core/asset/Contract.kt
@@ -20,12 +20,11 @@
 package com.github.ontio.core.asset
 
 import com.github.ontio.common.Address
-import com.github.ontio.crypto.Digest
-import com.github.ontio.io.*
-
+import com.github.ontio.io.BinaryReader
+import com.github.ontio.io.BinaryWriter
+import com.github.ontio.io.Serializable
 import java.io.ByteArrayInputStream
 import java.io.IOException
-import java.util.HashMap
 
 /**
  *

diff --git a/src/main/java/com/github/ontio/core/asset/Sig.kt b/src/main/java/com/github/ontio/core/asset/Sig.kt
@@ -21,14 +21,13 @@ package com.github.ontio.core.asset
 
 import com.github.ontio.common.Helper
 import com.github.ontio.core.program.Program
-import com.github.ontio.io.*
-
-import java.io.IOException
-import java.util.*
-
 import com.github.ontio.core.program.Program.ProgramFromMultiPubKey
 import com.github.ontio.core.program.Program.ProgramFromParams
 import com.github.ontio.core.program.Program.ProgramFromPubKey
+import com.github.ontio.io.BinaryReader
+import com.github.ontio.io.BinaryWriter
+import com.github.ontio.io.Serializable
+import java.util.*
 
 /**
  *

diff --git a/src/main/java/com/github/ontio/core/asset/State.kt b/src/main/java/com/github/ontio/core/asset/State.kt
@@ -21,13 +21,13 @@ package com.github.ontio.core.asset
 
 import com.github.ontio.common.Address
 import com.github.ontio.common.Helper
-import com.github.ontio.crypto.Digest
-import com.github.ontio.io.*
-
+import com.github.ontio.io.BinaryReader
+import com.github.ontio.io.BinaryWriter
+import com.github.ontio.io.Serializable
 import java.io.ByteArrayInputStream
 import java.io.IOException
 import java.math.BigInteger
-import java.util.HashMap
+import java.util.*
 
 /**
  *

diff --git a/src/main/java/com/github/ontio/core/asset/TransferFrom.kt b/src/main/java/com/github/ontio/core/asset/TransferFrom.kt
@@ -23,9 +23,7 @@ import com.github.ontio.common.Address
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
 import com.github.ontio.io.Serializable
-
-import java.io.IOException
-import java.util.HashMap
+import java.util.*
 
 /**
  *

diff --git a/src/main/java/com/github/ontio/core/asset/Transfers.kt b/src/main/java/com/github/ontio/core/asset/Transfers.kt
@@ -19,12 +19,12 @@
 
 package com.github.ontio.core.asset
 
-import com.github.ontio.io.*
-
+import com.github.ontio.io.BinaryReader
+import com.github.ontio.io.BinaryWriter
+import com.github.ontio.io.Serializable
 import java.io.ByteArrayInputStream
 import java.io.IOException
-import java.util.ArrayList
-import java.util.HashMap
+import java.util.*
 
 /**
  *

diff --git a/src/main/java/com/github/ontio/core/block/Block.kt b/src/main/java/com/github/ontio/core/block/Block.kt
@@ -19,18 +19,19 @@
 
 package com.github.ontio.core.block
 
-import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
-import java.io.IOException
-import java.util.function.Function
-
 import com.alibaba.fastjson.JSON
-import com.github.ontio.common.*
+import com.github.ontio.common.Address
+import com.github.ontio.common.Helper
+import com.github.ontio.common.UInt256
 import com.github.ontio.core.Inventory
 import com.github.ontio.core.InventoryType
 import com.github.ontio.core.transaction.Transaction
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.util.function.Function
 
 /**
  * block

diff --git a/src/main/java/com/github/ontio/core/globalparams/Params.kt b/src/main/java/com/github/ontio/core/globalparams/Params.kt
@@ -4,8 +4,6 @@ import com.github.ontio.common.Helper
 import com.github.ontio.io.BinaryReader
 import com.github.ontio.io.BinaryWriter
 import com.github.ontio.io.Serializable
-
-import java.io.IOException
 import java.math.BigInteger
 
 class Params(var params: Array<Param>) : Serializable {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ import com.github.ontio.io.BinaryReader @@
     import com.github.ontio.io.BinaryWriter
     import com.github.ontio.io.Serializable
-    import java.io.IOException
     /**
      *
      */
@@ Expand Down @@