Skip to content

Commit 6913a42

Browse files
ruixhuangruixhuang
authored
Clean up unit tests and validators (#807)
1 parent 3745cbb commit 6913a42

File tree

219 files changed

+4966
-21168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+4966
-21168
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ allprojects {
5252
}
5353

5454
group = "exchange.dydx.abacus"
55-
version = "1.12.75"
55+
version = "1.13.0"
5656

5757
repositories {
5858
google()

src/commonMain/kotlin/exchange.dydx.abacus/state/manager/AsyncAbacusStateManagerProtocol.kt renamed to src/commonMain/kotlin/exchange.dydx.abacus/AsyncAbacusStateManagerProtocol.kt

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,33 @@
1-
package exchange.dydx.abacus.state.manager
1+
package exchange.dydx.abacus
22

33
import exchange.dydx.abacus.output.ComplianceAction
44
import exchange.dydx.abacus.output.Documentation
55
import exchange.dydx.abacus.output.PerpetualState
66
import exchange.dydx.abacus.output.Restriction
77
import exchange.dydx.abacus.output.input.SelectionOption
88
import exchange.dydx.abacus.protocols.TransactionCallback
9-
import exchange.dydx.abacus.state.model.AdjustIsolatedMarginInputField
10-
import exchange.dydx.abacus.state.model.ClosePositionInputField
11-
import exchange.dydx.abacus.state.model.TradeInputField
12-
import exchange.dydx.abacus.state.model.TransferInputField
13-
import exchange.dydx.abacus.state.model.TriggerOrdersInputField
14-
import exchange.dydx.abacus.state.model.WalletConnectionType
9+
import exchange.dydx.abacus.state.machine.AdjustIsolatedMarginInputField
10+
import exchange.dydx.abacus.state.machine.ClosePositionInputField
11+
import exchange.dydx.abacus.state.machine.TradeInputField
12+
import exchange.dydx.abacus.state.machine.TransferInputField
13+
import exchange.dydx.abacus.state.machine.TriggerOrdersInputField
14+
import exchange.dydx.abacus.state.machine.WalletConnectionType
15+
import exchange.dydx.abacus.state.manager.ApiData
16+
import exchange.dydx.abacus.state.manager.AppSettings
17+
import exchange.dydx.abacus.state.manager.GasToken
18+
import exchange.dydx.abacus.state.manager.HistoricalPnlPeriod
19+
import exchange.dydx.abacus.state.manager.HistoricalTradingRewardsPeriod
20+
import exchange.dydx.abacus.state.manager.HumanReadableCancelAllOrdersPayload
21+
import exchange.dydx.abacus.state.manager.HumanReadableCancelOrderPayload
22+
import exchange.dydx.abacus.state.manager.HumanReadableCloseAllPositionsPayload
23+
import exchange.dydx.abacus.state.manager.HumanReadableDepositPayload
24+
import exchange.dydx.abacus.state.manager.HumanReadablePlaceOrderPayload
25+
import exchange.dydx.abacus.state.manager.HumanReadableSubaccountTransferPayload
26+
import exchange.dydx.abacus.state.manager.HumanReadableTriggerOrdersPayload
27+
import exchange.dydx.abacus.state.manager.HumanReadableWithdrawPayload
28+
import exchange.dydx.abacus.state.manager.OrderbookGrouping
29+
import exchange.dydx.abacus.state.manager.TransferChainInfo
30+
import exchange.dydx.abacus.state.manager.V4Environment
1531
import exchange.dydx.abacus.utils.IList
1632
import kotlin.js.JsExport
1733

src/commonMain/kotlin/exchange.dydx.abacus/state/v2/manager/AsyncAbacusStateManagerV2.kt renamed to src/commonMain/kotlin/exchange.dydx.abacus/AsyncAbacusStateManagerV2.kt

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package exchange.dydx.abacus.state.v2.manager
1+
package exchange.dydx.abacus
22

33
import exchange.dydx.abacus.di.AbacusScope
44
import exchange.dydx.abacus.di.Deployment
@@ -17,8 +17,15 @@ import exchange.dydx.abacus.protocols.TransactionCallback
1717
import exchange.dydx.abacus.protocols.asTypedObject
1818
import exchange.dydx.abacus.protocols.readCachedTextFile
1919
import exchange.dydx.abacus.responses.ParsingError
20-
import exchange.dydx.abacus.state.app.adaptors.V4TransactionErrors
21-
import exchange.dydx.abacus.state.app.helper.DynamicLocalizer
20+
import exchange.dydx.abacus.state.StateManagerAdaptorV2
21+
import exchange.dydx.abacus.state.helper.DynamicLocalizer
22+
import exchange.dydx.abacus.state.helper.V4TransactionErrors
23+
import exchange.dydx.abacus.state.machine.AdjustIsolatedMarginInputField
24+
import exchange.dydx.abacus.state.machine.ClosePositionInputField
25+
import exchange.dydx.abacus.state.machine.TradeInputField
26+
import exchange.dydx.abacus.state.machine.TransferInputField
27+
import exchange.dydx.abacus.state.machine.TriggerOrdersInputField
28+
import exchange.dydx.abacus.state.machine.WalletConnectionType
2229
import exchange.dydx.abacus.state.manager.ApiData
2330
import exchange.dydx.abacus.state.manager.AppSettings
2431
import exchange.dydx.abacus.state.manager.ConfigFile
@@ -34,17 +41,10 @@ import exchange.dydx.abacus.state.manager.HumanReadableSubaccountTransferPayload
3441
import exchange.dydx.abacus.state.manager.HumanReadableTriggerOrdersPayload
3542
import exchange.dydx.abacus.state.manager.HumanReadableWithdrawPayload
3643
import exchange.dydx.abacus.state.manager.OrderbookGrouping
37-
import exchange.dydx.abacus.state.manager.SingletonAsyncAbacusStateManagerProtocol
3844
import exchange.dydx.abacus.state.manager.TransferChainInfo
3945
import exchange.dydx.abacus.state.manager.V4Environment
4046
import exchange.dydx.abacus.state.manager.configs.V4StateManagerConfigs
41-
import exchange.dydx.abacus.state.model.AdjustIsolatedMarginInputField
42-
import exchange.dydx.abacus.state.model.ClosePositionInputField
43-
import exchange.dydx.abacus.state.model.TradeInputField
44-
import exchange.dydx.abacus.state.model.TransferInputField
45-
import exchange.dydx.abacus.state.model.TriggerOrdersInputField
46-
import exchange.dydx.abacus.state.model.WalletConnectionType
47-
import exchange.dydx.abacus.state.v2.supervisor.AppConfigsV2
47+
import exchange.dydx.abacus.state.supervisor.AppConfigsV2
4848
import exchange.dydx.abacus.utils.CoroutineTimer
4949
import exchange.dydx.abacus.utils.DummyFormatter
5050
import exchange.dydx.abacus.utils.DummyLocalizer
@@ -422,7 +422,7 @@ class AsyncAbacusStateManagerV2(
422422
for ((key, value) in environmentsData) {
423423
val data = parser.asMap(value) ?: continue
424424
val dydxChainId = parser.asString(data["dydxChainId"]) ?: continue
425-
val environment = V4Environment.parse(
425+
val environment = V4Environment.Companion.parse(
426426
id = key,
427427
data = data,
428428
parser = parser,
@@ -454,7 +454,7 @@ class AsyncAbacusStateManagerV2(
454454

455455
val apps = parser.asMap(items["apps"])
456456
if (apps != null) {
457-
this._appSettings = AppSettings.parse(apps, parser)
457+
this._appSettings = AppSettings.Companion.parse(apps, parser)
458458
}
459459

460460
return true
@@ -541,7 +541,7 @@ class AsyncAbacusStateManagerV2(
541541
try {
542542
return adaptor?.placeOrderPayload()
543543
} catch (e: Exception) {
544-
val error = V4TransactionErrors.error(null, e.toString())
544+
val error = V4TransactionErrors.Companion.error(null, e.toString())
545545
trackTransactionError("placeOrderPayload", error)
546546
throw e
547547
}
@@ -551,7 +551,7 @@ class AsyncAbacusStateManagerV2(
551551
try {
552552
return adaptor?.closePositionPayload()
553553
} catch (e: Exception) {
554-
val error = V4TransactionErrors.error(null, e.toString())
554+
val error = V4TransactionErrors.Companion.error(null, e.toString())
555555
trackTransactionError("closePositionPayload", error)
556556
throw e
557557
}
@@ -561,7 +561,7 @@ class AsyncAbacusStateManagerV2(
561561
try {
562562
return adaptor?.cancelOrderPayload(orderId)
563563
} catch (e: Exception) {
564-
val error = V4TransactionErrors.error(null, e.toString())
564+
val error = V4TransactionErrors.Companion.error(null, e.toString())
565565
trackTransactionError("cancelOrderPayload", error)
566566
throw e
567567
}
@@ -571,7 +571,7 @@ class AsyncAbacusStateManagerV2(
571571
try {
572572
return adaptor?.cancelAllOrdersPayload(marketId)
573573
} catch (e: Exception) {
574-
val error = V4TransactionErrors.error(null, e.toString())
574+
val error = V4TransactionErrors.Companion.error(null, e.toString())
575575
trackTransactionError("cancelAllOrdersPayload", error)
576576
throw e
577577
}
@@ -581,7 +581,7 @@ class AsyncAbacusStateManagerV2(
581581
try {
582582
return adaptor?.closeAllPositionsPayload()
583583
} catch (e: Exception) {
584-
val error = V4TransactionErrors.error(null, e.toString())
584+
val error = V4TransactionErrors.Companion.error(null, e.toString())
585585
trackTransactionError("closeAllPositionsPayload", error)
586586
throw e
587587
}
@@ -591,7 +591,7 @@ class AsyncAbacusStateManagerV2(
591591
try {
592592
return adaptor?.triggerOrdersPayload()
593593
} catch (e: Exception) {
594-
val error = V4TransactionErrors.error(null, e.toString())
594+
val error = V4TransactionErrors.Companion.error(null, e.toString())
595595
trackTransactionError("triggerOrdersPayload", error)
596596
throw e
597597
}
@@ -601,7 +601,7 @@ class AsyncAbacusStateManagerV2(
601601
try {
602602
return adaptor?.adjustIsolatedMarginPayload()
603603
} catch (e: Exception) {
604-
val error = V4TransactionErrors.error(null, e.toString())
604+
val error = V4TransactionErrors.Companion.error(null, e.toString())
605605
trackTransactionError("adjustIsolatedMarginPayload", error)
606606
throw e
607607
}
@@ -611,7 +611,7 @@ class AsyncAbacusStateManagerV2(
611611
try {
612612
return adaptor?.depositPayload()
613613
} catch (e: Exception) {
614-
val error = V4TransactionErrors.error(null, e.toString())
614+
val error = V4TransactionErrors.Companion.error(null, e.toString())
615615
trackTransactionError("depositPayload", error)
616616
throw e
617617
}
@@ -621,7 +621,7 @@ class AsyncAbacusStateManagerV2(
621621
try {
622622
return adaptor?.withdrawPayload()
623623
} catch (e: Exception) {
624-
val error = V4TransactionErrors.error(null, e.toString())
624+
val error = V4TransactionErrors.Companion.error(null, e.toString())
625625
trackTransactionError("withdrawPayload", error)
626626
throw e
627627
}
@@ -631,7 +631,7 @@ class AsyncAbacusStateManagerV2(
631631
try {
632632
return adaptor?.subaccountTransferPayload()
633633
} catch (e: Exception) {
634-
val error = V4TransactionErrors.error(null, e.toString())
634+
val error = V4TransactionErrors.Companion.error(null, e.toString())
635635
trackTransactionError("subaccountTransferPayload", error)
636636
throw e
637637
}
@@ -641,7 +641,7 @@ class AsyncAbacusStateManagerV2(
641641
return try {
642642
adaptor?.commitPlaceOrder(callback)
643643
} catch (e: Exception) {
644-
val error = V4TransactionErrors.error(null, e.toString())
644+
val error = V4TransactionErrors.Companion.error(null, e.toString())
645645
trackTransactionError("commitPlaceOrder", error)
646646
callback(false, error, null)
647647
null
@@ -652,7 +652,7 @@ class AsyncAbacusStateManagerV2(
652652
return try {
653653
adaptor?.commitTriggerOrders(callback)
654654
} catch (e: Exception) {
655-
val error = V4TransactionErrors.error(null, e.toString())
655+
val error = V4TransactionErrors.Companion.error(null, e.toString())
656656
trackTransactionError("commitTriggerOrders", error)
657657
callback(false, error, null)
658658
null
@@ -663,7 +663,7 @@ class AsyncAbacusStateManagerV2(
663663
return try {
664664
adaptor?.commitAdjustIsolatedMargin(callback)
665665
} catch (e: Exception) {
666-
val error = V4TransactionErrors.error(null, e.toString())
666+
val error = V4TransactionErrors.Companion.error(null, e.toString())
667667
trackTransactionError("commitAdjustIsolatedMargin", error)
668668
callback(false, error, null)
669669
null
@@ -674,7 +674,7 @@ class AsyncAbacusStateManagerV2(
674674
return try {
675675
adaptor?.commitClosePosition(callback)
676676
} catch (e: Exception) {
677-
val error = V4TransactionErrors.error(null, e.toString())
677+
val error = V4TransactionErrors.Companion.error(null, e.toString())
678678
trackTransactionError("commitClosePosition", error)
679679
callback(false, error, null)
680680
null
@@ -689,7 +689,7 @@ class AsyncAbacusStateManagerV2(
689689
try {
690690
adaptor?.commitTransfer(callback)
691691
} catch (e: Exception) {
692-
val error = V4TransactionErrors.error(null, e.toString())
692+
val error = V4TransactionErrors.Companion.error(null, e.toString())
693693
trackTransactionError("commitTransfer", error)
694694
callback(false, error, null)
695695
}
@@ -699,7 +699,7 @@ class AsyncAbacusStateManagerV2(
699699
try {
700700
adaptor?.commitCCTPWithdraw(callback)
701701
} catch (e: Exception) {
702-
val error = V4TransactionErrors.error(null, e.toString())
702+
val error = V4TransactionErrors.Companion.error(null, e.toString())
703703
trackTransactionError("commitCCTPWithdraw", error)
704704
callback(false, error, null)
705705
}
@@ -709,7 +709,7 @@ class AsyncAbacusStateManagerV2(
709709
try {
710710
adaptor?.faucet(amount, callback)
711711
} catch (e: Exception) {
712-
val error = V4TransactionErrors.error(null, e.toString())
712+
val error = V4TransactionErrors.Companion.error(null, e.toString())
713713
trackTransactionError("faucet", error)
714714
callback(false, error, null)
715715
}
@@ -719,7 +719,7 @@ class AsyncAbacusStateManagerV2(
719719
try {
720720
adaptor?.cancelOrder(orderId, callback)
721721
} catch (e: Exception) {
722-
val error = V4TransactionErrors.error(null, e.toString())
722+
val error = V4TransactionErrors.Companion.error(null, e.toString())
723723
trackTransactionError("cancelOrder", error)
724724
callback(false, error, null)
725725
}
@@ -729,7 +729,7 @@ class AsyncAbacusStateManagerV2(
729729
try {
730730
adaptor?.cancelAllOrders(marketId, callback)
731731
} catch (e: Exception) {
732-
val error = V4TransactionErrors.error(null, e.toString())
732+
val error = V4TransactionErrors.Companion.error(null, e.toString())
733733
trackTransactionError("cancelAllOrders", error)
734734
callback(false, error, null)
735735
}
@@ -739,7 +739,7 @@ class AsyncAbacusStateManagerV2(
739739
return try {
740740
adaptor?.closeAllPositions(callback)
741741
} catch (e: Exception) {
742-
val error = V4TransactionErrors.error(null, e.toString())
742+
val error = V4TransactionErrors.Companion.error(null, e.toString())
743743
trackTransactionError("closeAllPositions", error)
744744
callback(false, error, null)
745745
null
@@ -750,7 +750,7 @@ class AsyncAbacusStateManagerV2(
750750
try {
751751
adaptor?.triggerCompliance(action, callback)
752752
} catch (e: Exception) {
753-
val error = V4TransactionErrors.error(null, e.toString())
753+
val error = V4TransactionErrors.Companion.error(null, e.toString())
754754
trackTransactionError("triggerCompliance", error)
755755
callback(false, error, null)
756756
}

‎src/commonMain/kotlin/exchange.dydx.abacus/calculator/AccountCalculator.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import abs
44
import exchange.dydx.abacus.output.MarketConfigs
55
import exchange.dydx.abacus.output.input.OrderStatus
66
import exchange.dydx.abacus.protocols.ParserProtocol
7-
import exchange.dydx.abacus.state.internalstate.InternalAccountState
8-
import exchange.dydx.abacus.state.internalstate.InternalMarketState
9-
import exchange.dydx.abacus.state.internalstate.InternalMarketSummaryState
10-
import exchange.dydx.abacus.state.internalstate.InternalPendingPositionCalculated
11-
import exchange.dydx.abacus.state.internalstate.InternalPerpetualPendingPosition
12-
import exchange.dydx.abacus.state.internalstate.InternalSubaccountState
7+
import exchange.dydx.abacus.state.InternalAccountState
8+
import exchange.dydx.abacus.state.InternalMarketState
9+
import exchange.dydx.abacus.state.InternalMarketSummaryState
10+
import exchange.dydx.abacus.state.InternalPendingPositionCalculated
11+
import exchange.dydx.abacus.state.InternalPerpetualPendingPosition
12+
import exchange.dydx.abacus.state.InternalSubaccountState
1313
import exchange.dydx.abacus.utils.NUM_PARENT_SUBACCOUNTS
1414
import kollections.toIList
1515
import kotlin.collections.iterator

‎src/commonMain/kotlin/exchange.dydx.abacus/calculator/AccountTransformer.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package exchange.dydx.abacus.calculator
22

33
import exchange.dydx.abacus.output.input.MarginMode
44
import exchange.dydx.abacus.protocols.ParserProtocol
5-
import exchange.dydx.abacus.state.internalstate.InternalAccountState
6-
import exchange.dydx.abacus.state.internalstate.InternalMarketState
7-
import exchange.dydx.abacus.state.internalstate.InternalSubaccountState
8-
import exchange.dydx.abacus.state.internalstate.InternalTradeInputState
5+
import exchange.dydx.abacus.state.InternalAccountState
6+
import exchange.dydx.abacus.state.InternalMarketState
7+
import exchange.dydx.abacus.state.InternalSubaccountState
8+
import exchange.dydx.abacus.state.InternalTradeInputState
99

1010
internal class AccountTransformer(
1111
val parser: ParserProtocol,

‎src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import exchange.dydx.abacus.output.input.AdjustIsolatedMarginInputSummary
55
import exchange.dydx.abacus.output.input.IsolatedMarginAdjustmentType
66
import exchange.dydx.abacus.output.input.IsolatedMarginInputType
77
import exchange.dydx.abacus.protocols.ParserProtocol
8-
import exchange.dydx.abacus.state.internalstate.InternalAdjustIsolatedMarginInputState
9-
import exchange.dydx.abacus.state.internalstate.InternalMarketState
10-
import exchange.dydx.abacus.state.internalstate.InternalSubaccountState
11-
import exchange.dydx.abacus.state.internalstate.InternalWalletState
8+
import exchange.dydx.abacus.state.InternalAdjustIsolatedMarginInputState
9+
import exchange.dydx.abacus.state.InternalMarketState
10+
import exchange.dydx.abacus.state.InternalSubaccountState
11+
import exchange.dydx.abacus.state.InternalWalletState
1212
import exchange.dydx.abacus.utils.MARGIN_COLLATERALIZATION_CHECK_BUFFER
1313
import exchange.dydx.abacus.utils.MAX_LEVERAGE_BUFFER_PERCENT
1414
import exchange.dydx.abacus.utils.Numeric

0 commit comments

Comments
 (0)