Unwire the legacy router (#3757)

* Begin removing legacy router * update e2e test * test updates * fix build * fix build * fix build * simplify web hook * build * Update packages/web/hooks/use-swap.tsx Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * remove feature flags --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Jon Ator <jonathanator0@gmail.com>
osmosis-labs · Aug 19, 2024 · fa5fa80 · fa5fa80
1 parent 3656944
commit fa5fa80
Show file tree

Hide file tree

Showing 21 changed files with 99 additions and 1,417 deletions.
diff --git a/packages/pools/src/router/__tests__/pool.ts b/packages/pools/src/router/__tests__/pool.ts
@@ -11,7 +11,6 @@ import {
   RoutablePool,
   Route,
   RouteWithInAmount,
-  TokenOutGivenInRouter,
 } from "..";
 
 // Mock RoutablePool for testing purposes
@@ -82,10 +81,7 @@ export const makeMockRoutablePool = (
  */
 
 // Mock OptimizedRoutes for testing purposes to get access to protected methods
-export class TestOptimizedRoutes
-  extends OptimizedRoutes
-  implements TokenOutGivenInRouter
-{
+export class TestOptimizedRoutes extends OptimizedRoutes {
   constructor(...args: ConstructorParameters<typeof OptimizedRoutes>) {
     super(...args);
   }
@@ -125,10 +121,7 @@ export function makeDefaultTestRouterParams(
   return new TestOptimizedRoutes(params);
 }
 
-export class RoutesTestOptimizedRoutes
-  extends OptimizedRoutes
-  implements TokenOutGivenInRouter
-{
+export class RoutesTestOptimizedRoutes extends OptimizedRoutes {
   private testRoutes: Route[];
 
   constructor(

diff --git a/packages/pools/src/router/routes.ts b/packages/pools/src/router/routes.ts
@@ -10,14 +10,7 @@ import {
   RouteWithInAmount,
   validateRoute,
 } from "./route";
-import {
-  Logger,
-  Quote,
-  RoutablePool,
-  SplitTokenInQuote,
-  Token,
-  TokenOutGivenInRouter,
-} from "./types";
+import { Logger, Quote, RoutablePool, SplitTokenInQuote, Token } from "./types";
 import {
   cacheKeyForTokenOutGivenIn,
   invertRoute,
@@ -60,7 +53,7 @@ export type OptimizedRoutesParams = {
  *  @throws NotEnoughLiquidityError if there is not enough liquidity in a route.
  *  @throws NoRouteError if there is no route between the tokens.
  */
-export class OptimizedRoutes implements TokenOutGivenInRouter {
+export class OptimizedRoutes {
   protected readonly _sortedPools: RoutablePool[];
   protected readonly _preferredPoolIds?: string[];
   protected readonly _getPoolTotalValueLocked: (poolId: string) => Dec;

diff --git a/packages/pools/src/router/types.ts b/packages/pools/src/router/types.ts
@@ -9,15 +9,6 @@ export type Token = {
   amount: Int;
 };
 
-export interface TokenOutGivenInRouter {
-  /** Route, with splits, given an in token and out denom. */
-  routeByTokenIn(
-    tokenIn: Token,
-    tokenOutDenom: string,
-    forcePoolId?: string
-  ): Promise<SplitTokenInQuote>;
-}
-
 export interface RoutablePool {
   /** Unique identifier across pools. */
   id: string;

diff --git a/packages/server/src/queries/complex/index.ts b/packages/server/src/queries/complex/index.ts
@@ -9,5 +9,4 @@ export * from "./osmosis";
 export * from "./pools";
 export * from "./portfolio";
 export * from "./staking";
-export * from "./swap-routers";
 export * from "./transactions";
diff --git a/packages/server/src/queries/complex/pools/index.ts b/packages/server/src/queries/complex/pools/index.ts
@@ -159,7 +159,6 @@ export * from "./bonding";
 export * from "./env";
 export * from "./incentives";
 export * from "./providers";
-export * from "./route-token-out-given-in";
 export * from "./share";
 export * from "./superfluid";
 export * from "./transmuter";