refactor: move squid to new dir

dydxprotocol · May 28, 2024 · 27fcf3d · 27fcf3d
1 parent 0061a67
commit 27fcf3d
Show file tree

Hide file tree

Showing 26 changed files with 21 additions and 627 deletions.
diff --git a/...mmonMain/kotlin/exchange.dydx.abacus/processor/router/Squid/SquidRoutePayloadProcessor.kt b/...mmonMain/kotlin/exchange.dydx.abacus/processor/router/Squid/SquidRoutePayloadProcessor.kt
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/processor/router/Squid/SquidStatusProcessor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/processor/router/Squid/SquidStatusProcessor.kt
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/processor/router/Squid/SquidTokenProcessor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/processor/router/Squid/SquidTokenProcessor.kt
diff --git a/...monMain/kotlin/exchange.dydx.abacus/processor/router/Squid/SquidTokenResourceProcessor.kt b/...monMain/kotlin/exchange.dydx.abacus/processor/router/Squid/SquidTokenResourceProcessor.kt
diff --git a/...ocessor/router/Skip/SkipChainProcessor.kt → ...ocessor/router/skip/SkipChainProcessor.kt b/...ocessor/router/Skip/SkipChainProcessor.kt → ...ocessor/router/skip/SkipChainProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.router.Skip
+package exchange.dydx.abacus.processor.router.skip
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...router/Skip/SkipChainResourceProcessor.kt → ...router/skip/SkipChainResourceProcessor.kt b/...router/Skip/SkipChainResourceProcessor.kt → ...router/skip/SkipChainResourceProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.router.Skip
+package exchange.dydx.abacus.processor.router.skip
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...us/processor/router/Skip/SkipProcessor.kt → ...us/processor/router/skip/SkipProcessor.kt b/...us/processor/router/Skip/SkipProcessor.kt → ...us/processor/router/skip/SkipProcessor.kt
@@ -2,14 +2,7 @@ package exchange.dydx.abacus.processor.router.Squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.processor.router.*
-import exchange.dydx.abacus.processor.router.Skip.SkipChainProcessor
-import exchange.dydx.abacus.processor.router.Skip.SkipChainResourceProcessor
-import exchange.dydx.abacus.processor.router.Skip.SkipTokenProcessor
-import exchange.dydx.abacus.processor.router.Skip.SkipTokenResourceProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol
-import exchange.dydx.abacus.state.manager.CctpConfig.cctpChainIds
-import exchange.dydx.abacus.utils.Logger
-import exchange.dydx.abacus.utils.mutable
 import exchange.dydx.abacus.utils.safeSet
 
 internal class SkipProcessor(parser: ParserProtocol) : BaseProcessor(parser), IRouterProcessor {
@@ -83,7 +76,7 @@ internal class SkipProcessor(parser: ParserProtocol) : BaseProcessor(parser), IR
         throw Error("Not Implemented!")
     }
 
-    override fun selectedTokenDecimals(tokenAddress: String?, selectedChainId: String?): String? {
+    override fun selectedTokenDecimals(tokenAddress: String?): String? {
         throw Error("Not Implemented!")
     }
 

diff --git a/...ocessor/router/Skip/SkipTokenProcessor.kt → ...ocessor/router/skip/SkipTokenProcessor.kt b/...ocessor/router/Skip/SkipTokenProcessor.kt → ...ocessor/router/skip/SkipTokenProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.router.Skip
+package exchange.dydx.abacus.processor.router.skip
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...router/Skip/SkipTokenResourceProcessor.kt → ...router/skip/SkipTokenResourceProcessor.kt b/...router/Skip/SkipTokenResourceProcessor.kt → ...router/skip/SkipTokenResourceProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.router.Skip
+package exchange.dydx.abacus.processor.router.skip
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...essor/router/Squid/SquidChainProcessor.kt → ...essor/router/squid/SquidChainProcessor.kt b/...essor/router/Squid/SquidChainProcessor.kt → ...essor/router/squid/SquidChainProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.router.Squid
+package exchange.dydx.abacus.processor.router.squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...uter/Squid/SquidChainResourceProcessor.kt → ...uter/squid/SquidChainResourceProcessor.kt b/...uter/Squid/SquidChainResourceProcessor.kt → ...uter/squid/SquidChainResourceProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.router.Squid
+package exchange.dydx.abacus.processor.router.squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/.../processor/router/Squid/SquidProcessor.kt → .../processor/router/squid/SquidProcessor.kt b/.../processor/router/Squid/SquidProcessor.kt → .../processor/router/squid/SquidProcessor.kt
@@ -1,10 +1,9 @@
-package exchange.dydx.abacus.processor.router.Squid
+package exchange.dydx.abacus.processor.router.squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
-import exchange.dydx.abacus.processor.router.*
+import exchange.dydx.abacus.processor.router.IRouterProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol
 import exchange.dydx.abacus.state.manager.CctpConfig.cctpChainIds
-import exchange.dydx.abacus.utils.Logger
 import exchange.dydx.abacus.utils.mutable
 import exchange.dydx.abacus.utils.safeSet
 
@@ -165,7 +164,7 @@ internal class SquidProcessor(parser: ParserProtocol) : BaseProcessor(parser), I
     }
 
     override fun updateTokensDefaults(modified: MutableMap<String, Any>, selectedChainId: String?) {
-        val tokenOptions = this.tokenOptions(selectedChainId)
+        val tokenOptions = tokenOptions(selectedChainId)
         modified.safeSet("transfer.depositOptions.assets", tokenOptions)
         modified.safeSet("transfer.withdrawalOptions.assets", tokenOptions)
         modified.safeSet("transfer.token", defaultTokenAddress(selectedChainId))
@@ -174,7 +173,7 @@ internal class SquidProcessor(parser: ParserProtocol) : BaseProcessor(parser), I
 
     override fun defaultChainId(): String? {
         val selectedChain = parser.asNativeMap(this.chains?.firstOrNull())
-        return parser.asString(selectedChain?.get("chain_id"))
+        return parser.asString(selectedChain?.get("chainId"))
     }
 
     override fun selectedTokenSymbol(tokenAddress: String?): String? {
@@ -186,7 +185,7 @@ internal class SquidProcessor(parser: ParserProtocol) : BaseProcessor(parser), I
         return null
     }
 
-    override fun selectedTokenDecimals(tokenAddress: String?, selectedChainId: String?): String? {
+    override fun selectedTokenDecimals(tokenAddress: String?): String? {
         this.tokens?.find {
             parser.asString(parser.asNativeMap(it)?.get("address")) == tokenAddress
         }?.let {
@@ -282,6 +281,7 @@ internal class SquidProcessor(parser: ParserProtocol) : BaseProcessor(parser), I
 
         val selectedChainId = chainId ?: defaultChainId()
         selectedChainId?.let {
+            selectedChainId
             this.tokens?.let {
                 for (token in it) {
                     parser.asNativeMap(token)?.let { token ->
@@ -296,5 +296,4 @@ internal class SquidProcessor(parser: ParserProtocol) : BaseProcessor(parser), I
         options.sortBy { parser.asString(parser.asNativeMap(it)?.get("stringKey")) }
         return options
     }
-
 }
diff --git a/...essor/squid/SquidRoutePayloadProcessor.kt → ...outer/squid/SquidRoutePayloadProcessor.kt b/...essor/squid/SquidRoutePayloadProcessor.kt → ...outer/squid/SquidRoutePayloadProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.squid
+package exchange.dydx.abacus.processor.router.squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...essor/router/Squid/SquidRouteProcessor.kt → ...essor/router/squid/SquidRouteProcessor.kt b/...essor/router/Squid/SquidRouteProcessor.kt → ...essor/router/squid/SquidRouteProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.router.Squid
+package exchange.dydx.abacus.processor.router.squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...ter/Squid/SquidRouteV2PayloadProcessor.kt → ...ter/squid/SquidRouteV2PayloadProcessor.kt b/...ter/Squid/SquidRouteV2PayloadProcessor.kt → ...ter/squid/SquidRouteV2PayloadProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.router.Squid
+package exchange.dydx.abacus.processor.router.squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...sor/router/Squid/SquidRouteV2Processor.kt → ...sor/router/squid/SquidRouteV2Processor.kt b/...sor/router/Squid/SquidRouteV2Processor.kt → ...sor/router/squid/SquidRouteV2Processor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.router.Squid
+package exchange.dydx.abacus.processor.router.squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...s/processor/squid/SquidStatusProcessor.kt → ...ssor/router/squid/SquidStatusProcessor.kt b/...s/processor/squid/SquidStatusProcessor.kt → ...ssor/router/squid/SquidStatusProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.squid
+package exchange.dydx.abacus.processor.router.squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...us/processor/squid/SquidTokenProcessor.kt → ...essor/router/squid/SquidTokenProcessor.kt b/...us/processor/squid/SquidTokenProcessor.kt → ...essor/router/squid/SquidTokenProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.squid
+package exchange.dydx.abacus.processor.router.squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/...ssor/squid/SquidTokenResourceProcessor.kt → ...uter/squid/SquidTokenResourceProcessor.kt b/...ssor/squid/SquidTokenResourceProcessor.kt → ...uter/squid/SquidTokenResourceProcessor.kt
@@ -1,4 +1,4 @@
-package exchange.dydx.abacus.processor.squid
+package exchange.dydx.abacus.processor.router.squid
 
 import exchange.dydx.abacus.processor.base.BaseProcessor
 import exchange.dydx.abacus.protocols.ParserProtocol

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/processor/squid/SquidChainProcessor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/processor/squid/SquidChainProcessor.kt
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/processor/squid/SquidChainResourceProcessor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/processor/squid/SquidChainResourceProcessor.kt