resolve dependency cycle

change router/router -> router/core
gnoswap-labs · Aug 27, 2024 · 5a05455 · 5a05455
1 parent 7622d39
commit 5a05455
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 23 deletions.
diff --git a/router/alpha-router-params.go → core/alpha-router-params.go b/router/alpha-router-params.go → core/alpha-router-params.go
@@ -1,4 +1,4 @@
-package router
+package core
 
 type AlphaRouterParams struct {
 }
diff --git a/router/alpha-router.go → core/alpha-router.go b/router/alpha-router.go → core/alpha-router.go
@@ -1,10 +1,9 @@
-package router
+package core
 
 import (
-	"router/router/core"
-	"router/router/core/entities"
-	"router/router/core/entities/fractions"
-	"router/router/providers"
+	"router/core/entities"
+	"router/core/entities/fractions"
+	"router/core/providers"
 )
 
 type AlphaRouter struct {
@@ -20,7 +19,7 @@ func NewAlphaRouter(params AlphaRouterParams) *AlphaRouter {
 func (a AlphaRouter) route(
 	amount fractions.CurrencyAmount,
 	quoteCurrency entities.Currency,
-	tradeType core.TradeType,
+	tradeType TradeType,
 	swapConfig SwapOptions,
 ) SwapRoute {
 	originalAmount := amount
@@ -34,33 +33,30 @@ func (a AlphaRouter) route(
 	tokenOut := currencyOut.Wrapped()
 
 	// core 패키지를 TradeType 패키지로 변경하면 가독성이 더 좋아질 듯 하다.
-	if tradeType == core.EXACT_OUTPUT {
+	if tradeType == EXACT_OUTPUT {
 		// TODO: GetPortionAmount에서 반환 값인 CurrencyAmount을 반환하지 못할 경우가 있을 수도 있다.(높은 확률로)
 		portionAmount := a.portionProvider.GetPortionAmount(
 			amount,
 			tradeType,
 			swapConfig,
 		)
 
-		result, err := portionAmount.GreaterThan(0)
-		if err != nil {
-			// 오류
-		}
-		if result {
-			amount = amount.add(portionAmount)
-		}
+		//result := portionAmount.GreaterThan(0)
+		//if result {
+		//	amount = amount.add(portionAmount)
+		//}
 	}
 
 	swapRoute := SwapRoute{}
 	return swapRoute
 }
 
 func (a AlphaRouter) determineCurrencyInOutFromTradeType(
-	tradeType core.TradeType,
+	tradeType TradeType,
 	amount fractions.CurrencyAmount,
 	quoteCurrency entities.Currency,
 ) (entities.Currency, entities.Currency) {
-	if tradeType == core.EXACT_INPUT {
+	if tradeType == EXACT_INPUT {
 		return amount.Currency, quoteCurrency
 	} else {
 		return quoteCurrency, amount.Currency

diff --git a/router/core/constants.go → core/constants.go b/router/core/constants.go → core/constants.go
diff --git a/router/core/entities/baseCurrency.go → core/entities/baseCurrency.go b/router/core/entities/baseCurrency.go → core/entities/baseCurrency.go
diff --git a/router/core/entities/currency.go → core/entities/currency.go b/router/core/entities/currency.go → core/entities/currency.go
diff --git a/...core/entities/fractions/currencyAmount.go → core/entities/fractions/currencyAmount.go b/...core/entities/fractions/currencyAmount.go → core/entities/fractions/currencyAmount.go
@@ -1,6 +1,8 @@
 package fractions
 
-import "router/router/core/entities"
+import (
+	"router/core/entities"
+)
 
 type CurrencyAmount struct {
 	Fraction

diff --git a/router/core/entities/fractions/fraction.go → core/entities/fractions/fraction.go b/router/core/entities/fractions/fraction.go → core/entities/fractions/fraction.go
diff --git a/.../core/entities/fractions/fraction_test.go → core/entities/fractions/fraction_test.go b/.../core/entities/fractions/fraction_test.go → core/entities/fractions/fraction_test.go
diff --git a/router/core/entities/gnot.go → core/entities/gnot.go b/router/core/entities/gnot.go → core/entities/gnot.go
diff --git a/router/core/entities/nativeCurrency.go → core/entities/nativeCurrency.go b/router/core/entities/nativeCurrency.go → core/entities/nativeCurrency.go
diff --git a/router/core/entities/token.go → core/entities/token.go b/router/core/entities/token.go → core/entities/token.go
diff --git a/router/core/entities/utils/math.go → core/entities/utils/math.go b/router/core/entities/utils/math.go → core/entities/utils/math.go
diff --git a/router/core/entities/wgnot.go → core/entities/wgnot.go b/router/core/entities/wgnot.go → core/entities/wgnot.go
diff --git a/router/providers/portion-provider.go → core/providers/portion-provider.go b/router/providers/portion-provider.go → core/providers/portion-provider.go
@@ -1,14 +1,13 @@
 package providers
 
 import (
-	"router/router"
-	"router/router/core"
-	"router/router/core/entities/fractions"
+	"router/core"
+	"router/core/entities/fractions"
 )
 
 // interface는 I 접두사를 붙이는 것이 관행인가?
 type IPortionProvider interface {
-	GetPortionAmount(tokenOutAmount fractions.CurrencyAmount, tradeType core.TradeType, swapConfig router.SwapOptions) fractions.CurrencyAmount
+	GetPortionAmount(tokenOutAmount fractions.CurrencyAmount, tradeType core.TradeType, swapConfig core.SwapOptions) fractions.CurrencyAmount
 }
 
 type PortionProvider struct {

diff --git a/router/router.go → core/router.go b/router/router.go → core/router.go
@@ -1,4 +1,4 @@
-package router
+package core
 
 type SwapRoute struct {
 }