Ktlint formatting has been applied

Tameki · Tameki · commit b3b25ee7dd26 · 2019-10-30T14:21:44.000+06:00
diff --git a/zrxkit/build.gradle b/zrxkit/build.gradle
@@ -40,6 +40,14 @@ android {
     lintOptions {
         warning 'InvalidPackage'
     }
+
+    kotlinter {
+        ignoreFailures = false
+        reporters = ['checkstyle', 'plain']
+        experimentalRules = false
+        fileBatchSize = 30
+        disabledRules = ["no-wildcard-imports"]
+    }
 }
 
 dependencies {
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/Exceptions.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/Exceptions.kt
@@ -1,4 +1,4 @@
 package com.blocksdecoded.zrxkit
 
-class InvalidSignatureException: Exception("Invalid order signature")
-class UnsupportedSignatureType(type: Int): Exception("Unsupported signature type $type")
+class InvalidSignatureException : Exception("Invalid order signature")
+class UnsupportedSignatureType(type: Int) : Exception("Unsupported signature type $type")
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/ZrxKit.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/ZrxKit.kt
@@ -11,11 +11,11 @@ import com.blocksdecoded.zrxkit.relayer.model.Relayer
 import com.blocksdecoded.zrxkit.sign.SignUtils
 import com.blocksdecoded.zrxkit.utils.toEther
 import io.reactivex.Flowable
+import java.math.BigDecimal
+import java.math.BigInteger
 import org.web3j.crypto.Credentials
 import org.web3j.crypto.ECKeyPair
 import org.web3j.tx.gas.ContractGasProvider
-import java.math.BigDecimal
-import java.math.BigInteger
 
 class ZrxKit private constructor(
     val relayerManager: IRelayerManager,
@@ -110,8 +110,8 @@ class ZrxKit private constructor(
         }
     }
 
-    abstract class GasInfoProvider: ContractGasProvider {
-        override fun getGasLimit(contractFunc: String?): BigInteger = when(contractFunc) {
+    abstract class GasInfoProvider : ContractGasProvider {
+        override fun getGasLimit(contractFunc: String?): BigInteger = when (contractFunc) {
             WethWrapper.FUNC_DEPOSIT -> 40000.toBigInteger()
             WethWrapper.FUNC_WITHDRAW -> 60000.toBigInteger()
             Erc20ProxyWrapper.FUNC_APPROVE -> 80000.toBigInteger()
@@ -123,4 +123,4 @@ class ZrxKit private constructor(
         override fun getGasLimit(): BigInteger = getGasLimit("")
         override fun getGasPrice(): BigInteger = getGasPrice("")
     }
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/Contracts.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/Contracts.kt
@@ -3,9 +3,9 @@ package com.blocksdecoded.zrxkit.contracts
 import com.blocksdecoded.zrxkit.model.OrderInfo
 import com.blocksdecoded.zrxkit.model.SignedOrder
 import io.reactivex.Flowable
-import org.web3j.protocol.core.methods.response.TransactionReceipt
 import java.math.BigDecimal
 import java.math.BigInteger
+import org.web3j.protocol.core.methods.response.TransactionReceipt
 
 interface IErc20Proxy {
     fun lockProxy(): Flowable<TransactionReceipt>
@@ -36,4 +36,4 @@ interface IZrxExchange {
     fun cancelOrder(order: SignedOrder): Flowable<String>
 
     fun ordersInfo(orders: List<SignedOrder>): Flowable<List<OrderInfo>>
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/Erc20ProxyWrapper.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/Erc20ProxyWrapper.kt
@@ -2,6 +2,7 @@ package com.blocksdecoded.zrxkit.contracts
 
 import com.blocksdecoded.zrxkit.utils.Constants.MAX_ALLOWANCE
 import io.reactivex.Flowable
+import java.math.BigInteger
 import org.web3j.abi.TypeReference
 import org.web3j.abi.datatypes.Address
 import org.web3j.abi.datatypes.Function
@@ -13,7 +14,6 @@ import org.web3j.protocol.core.methods.response.TransactionReceipt
 import org.web3j.protocol.http.HttpService
 import org.web3j.tx.Contract
 import org.web3j.tx.gas.ContractGasProvider
-import java.math.BigInteger
 
 internal class Erc20ProxyWrapper(
     contractAddress: String,
@@ -54,4 +54,4 @@ internal class Erc20ProxyWrapper(
 
         private const val BINARY = ""
     }
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/StructFunctionEncoder.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/StructFunctionEncoder.kt
@@ -1,20 +1,20 @@
 package com.blocksdecoded.zrxkit.contracts
 
-import com.blocksdecoded.zrxkit.utils.clearPrefix
 import com.blocksdecoded.zrxkit.contracts.StructFunctionEncoder.ExchangeFunction.*
-import com.blocksdecoded.zrxkit.utils.decodePrefixedHex
-import com.blocksdecoded.zrxkit.utils.hexStringToByteArray
 import com.blocksdecoded.zrxkit.model.OrderInfo
 import com.blocksdecoded.zrxkit.model.SignedOrder
+import com.blocksdecoded.zrxkit.utils.clearPrefix
+import com.blocksdecoded.zrxkit.utils.decodePrefixedHex
+import com.blocksdecoded.zrxkit.utils.hexStringToByteArray
 import com.blocksdecoded.zrxkit.utils.prefixed
 import com.esaulpaugh.headlong.abi.Function
 import com.esaulpaugh.headlong.abi.Tuple
+import java.math.BigInteger
 import org.bouncycastle.util.encoders.Hex
 import org.web3j.abi.datatypes.Address
 import org.web3j.crypto.RawTransaction
 import org.web3j.tx.gas.ContractGasProvider
 import org.web3j.utils.Numeric
-import java.math.BigInteger
 
 internal class StructFunctionEncoder(
     private val gasProvider: ContractGasProvider
@@ -41,7 +41,7 @@ internal class StructFunctionEncoder(
         val items = ArrayList<Any>()
 
         args.forEach {
-            val element = when(it) {
+            val element = when (it) {
                 is SignedOrder -> getTupleFromOrder(it)
 
                 is String -> it.decodePrefixedHex()
@@ -141,7 +141,7 @@ internal class StructFunctionEncoder(
         )
     }
 
-    fun encodedOrdersInfoData(orders: List<SignedOrder>) : String =
+    fun encodedOrdersInfoData(orders: List<SignedOrder>): String =
         encodeFunction(ORDERS_INFO, listOf(orders), prefixed = false)
 
     fun decodeOrdersInfo(data: String): List<OrderInfo> {
@@ -199,4 +199,4 @@ internal class StructFunctionEncoder(
 
         val functionName: String = signature.substringBefore("(")
     }
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/WethWrapper.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/WethWrapper.kt
@@ -2,6 +2,8 @@ package com.blocksdecoded.zrxkit.contracts
 
 import com.blocksdecoded.zrxkit.utils.toEther
 import io.reactivex.Flowable
+import java.math.BigDecimal
+import java.math.BigInteger
 import org.web3j.abi.datatypes.Function
 import org.web3j.abi.datatypes.generated.Uint256
 import org.web3j.crypto.Credentials
@@ -10,8 +12,6 @@ import org.web3j.protocol.core.methods.response.TransactionReceipt
 import org.web3j.protocol.http.HttpService
 import org.web3j.tx.Contract
 import org.web3j.tx.gas.ContractGasProvider
-import java.math.BigDecimal
-import java.math.BigInteger
 
 internal class WethWrapper(
     contractAddress: String,
@@ -61,4 +61,4 @@ internal class WethWrapper(
 
         private const val BINARY = ""
     }
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/ZrxExchangeWrapper.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/ZrxExchangeWrapper.kt
@@ -3,6 +3,7 @@ package com.blocksdecoded.zrxkit.contracts
 import com.blocksdecoded.zrxkit.model.OrderInfo
 import com.blocksdecoded.zrxkit.model.SignedOrder
 import io.reactivex.Flowable
+import java.math.BigInteger
 import org.web3j.crypto.Credentials
 import org.web3j.crypto.RawTransaction
 import org.web3j.crypto.TransactionEncoder
@@ -12,7 +13,6 @@ import org.web3j.protocol.http.HttpService
 import org.web3j.tx.Contract
 import org.web3j.tx.gas.ContractGasProvider
 import org.web3j.utils.Numeric
-import java.math.BigInteger
 
 internal class ZrxExchangeWrapper(
     contractAddress: String,
@@ -115,4 +115,4 @@ internal class ZrxExchangeWrapper(
     companion object {
         private const val BINARY = ""
     }
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/AssetItem.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/AssetItem.kt
@@ -8,4 +8,4 @@ data class AssetItem(
     val address: String,
     val type: EAssetProxyId,
     val assetData: String = type.encode(address)
-)
+)
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/EAssetProxyId.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/EAssetProxyId.kt
@@ -8,17 +8,17 @@ enum class EAssetProxyId(
     MultiAsset("0x94cfcdd7"),
     ERC1155("0xa7cb5fb7");
 
-    fun encode(asset: String): String = when(this) {
+    fun encode(asset: String): String = when (this) {
         ERC20 -> "${id}000000000000000000000000" + asset.replace("0x", "").toLowerCase()
         ERC721 -> TODO("ERC721 tokens are not supported yet.")
         MultiAsset -> TODO("MultiAsset tokens are not supported yet.")
         ERC1155 -> TODO("ERC1155 tokens are not supported yet.")
     }
 
-    fun decode(asset: String): String = when(this) {
+    fun decode(asset: String): String = when (this) {
         ERC20 -> "0x" + asset.replace("${id}000000000000000000000000", "").toLowerCase()
         ERC721 -> TODO("ERC721 tokens are not supported yet.")
         MultiAsset -> TODO("MultiAsset tokens are not supported yet.")
         ERC1155 -> TODO("ERC1155 tokens are not supported yet.")
     }
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/ESignatureType.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/ESignatureType.kt
@@ -9,4 +9,4 @@ enum class ESignatureType {
     VALIDATOR,
     PRESIGNED,
     NSIGTATURE_TYPES
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/IOrder.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/IOrder.kt
@@ -14,4 +14,4 @@ interface IOrder {
     val makerFee: String
     val takerFee: String
     val salt: String
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/Order.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/Order.kt
@@ -14,4 +14,4 @@ data class Order(
     override val makerFee: String,
     override val takerFee: String,
     override val salt: String
-): IOrder
+) : IOrder
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/OrderInfo.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/OrderInfo.kt
@@ -6,4 +6,4 @@ data class OrderInfo(
     val orderStatus: String,
     val orderHash: String,
     val orderTakerAssetFilledAmount: BigInteger
-)
+)
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/SignedOrder.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/model/SignedOrder.kt
@@ -15,7 +15,7 @@ data class SignedOrder(
     override val takerFee: String,
     override val salt: String,
     val signature: String
-): IOrder {
+) : IOrder {
 
     companion object {
         fun fromOrder(order: IOrder, signature: String): SignedOrder =
@@ -36,5 +36,4 @@ data class SignedOrder(
                 signature
             )
     }
-
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/IRelayerManager.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/IRelayerManager.kt
@@ -1,9 +1,9 @@
 package com.blocksdecoded.zrxkit.relayer
 
-import com.blocksdecoded.zrxkit.relayer.model.AssetPair
-import com.blocksdecoded.zrxkit.relayer.remote.OrderBookResponse
 import com.blocksdecoded.zrxkit.model.SignedOrder
+import com.blocksdecoded.zrxkit.relayer.model.AssetPair
 import com.blocksdecoded.zrxkit.relayer.model.Relayer
+import com.blocksdecoded.zrxkit.relayer.remote.OrderBookResponse
 import io.reactivex.Flowable
 
 interface IRelayerManager {
@@ -16,4 +16,4 @@ interface IRelayerManager {
     fun postOrder(relayerId: Int, order: SignedOrder): Flowable<Unit>
 
     fun getOrders(relayerId: Int, makerAddress: String, makerAsset: String, takerAsset: String): Flowable<OrderBookResponse>
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/RelayerManager.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/RelayerManager.kt
@@ -1,11 +1,11 @@
 package com.blocksdecoded.zrxkit.relayer
 
 import com.blocksdecoded.zrxkit.ZrxKit
+import com.blocksdecoded.zrxkit.model.SignedOrder
 import com.blocksdecoded.zrxkit.relayer.model.AssetPair
+import com.blocksdecoded.zrxkit.relayer.model.Relayer
 import com.blocksdecoded.zrxkit.relayer.remote.OrderBookResponse
 import com.blocksdecoded.zrxkit.relayer.remote.RelayerApiClient
-import com.blocksdecoded.zrxkit.model.SignedOrder
-import com.blocksdecoded.zrxkit.relayer.model.Relayer
 import io.reactivex.Flowable
 
 class RelayerManager(
@@ -31,4 +31,4 @@ class RelayerManager(
     ): Flowable<OrderBookResponse> {
         TODO("Get orders not implemented")
     }
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/local/iRelayerLocalStorage.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/local/iRelayerLocalStorage.kt
@@ -1,4 +1,3 @@
 package com.blocksdecoded.zrxkit.relayer.local
 
-interface iRelayerLocalStorage {
-}
+interface iRelayerLocalStorage
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/model/AssetPair.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/model/AssetPair.kt
@@ -19,4 +19,4 @@ data class Asset(
     val maxAmount: BigInteger,
     val assetData: String,
     val precision: Int
-)
+)
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/model/FeeRecipientsResponse.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/model/FeeRecipientsResponse.kt
@@ -5,4 +5,4 @@ data class FeeRecipientsResponse(
     val page: Int,
     val perPage: Int,
     val records: List<String>
-)
+)
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/model/OrderBook.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/model/OrderBook.kt
@@ -16,4 +16,4 @@ data class OrderRecord(
 
 data class OrderMetaData(
     val orderHash: String?
-)
+)
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/model/Relayer.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/model/Relayer.kt
@@ -15,4 +15,4 @@ data class RelayerConfig(
     val baseUrl: String,
     val suffix: String,
     val version: String
-)
+)
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/remote/OrderBookResponse.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/remote/OrderBookResponse.kt
@@ -2,7 +2,7 @@ package com.blocksdecoded.zrxkit.relayer.remote
 
 import com.blocksdecoded.zrxkit.relayer.model.OrderBook
 
-data class OrderBookResponse (
+data class OrderBookResponse(
     val bids: OrderBook,
     val asks: OrderBook
-)
+)
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/remote/RelayerApiClient.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/relayer/remote/RelayerApiClient.kt
@@ -75,8 +75,8 @@ class RelayerApiClient(relayerConfig: RelayerConfig) {
 
         @GET
         fun getFeeRecipients(
-                @Url url: String,
-                @Query("networkId") int: Int
+            @Url url: String,
+            @Query("networkId") int: Int
         ): Single<FeeRecipientsResponse>
 
         @POST
@@ -93,4 +93,4 @@ class RelayerApiClient(relayerConfig: RelayerConfig) {
             @Query("networkId") int: Int
         ): Single<AssetPairsResponse>
     }
-}
+}
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/sign/SignUtils.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/sign/SignUtils.kt
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/sign/eip712/Eip712Data.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/sign/eip712/Eip712Data.kt
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/sign/eip712/Eip712Encoder.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/sign/eip712/Eip712Encoder.kt
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/utils/Constants.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/utils/Constants.kt
diff --git a/zrxkit/src/main/java/com/blocksdecoded/zrxkit/utils/Extensions.kt b/zrxkit/src/main/java/com/blocksdecoded/zrxkit/utils/Extensions.kt
diff --git a/zrxkit/src/test/java/com/blocksdecoded/zrxkit/utils/eip712/Eip712EncoderTest.kt b/zrxkit/src/test/java/com/blocksdecoded/zrxkit/utils/eip712/Eip712EncoderTest.kt

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,14 @@ android {`
`40`	`40`	`lintOptions {`
`41`	`41`	`warning 'InvalidPackage'`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ kotlinter {`
	`45`	`+ ignoreFailures = false`
	`46`	`+ reporters = ['checkstyle', 'plain']`
	`47`	`+ experimentalRules = false`
	`48`	`+ fileBatchSize = 30`
	`49`	`+ disabledRules = ["no-wildcard-imports"]`
	`50`	`+ }`
`43`	`51`	`}`
`44`	`52`
`45`	`53`	`dependencies {`