fix

src/abacus-ts/calculators/orders.ts

@@ -8,12 +8,11 @@ import { assertNever } from '@/lib/assertNever';
 import { MustBigNumber } from '@/lib/numbers';
 
 import { Loadable } from '../lib/loadable';
+import { mapLoadableData } from '../lib/mapLoadable';
+import { mergeObjects } from '../lib/mergeObjects';
 import { OrdersData } from '../rawTypes';
 import { OrderStatus } from '../summaryTypes';
 
-const BN_0 = MustBigNumber(0);
-const BN_1 = MustBigNumber(1);
-
 // todo these are calculating the same thing twice pasically
 function calculateOpenOrders(liveOrders: Loadable<OrdersData>, restOrders: Loadable<OrdersData>) {
   const getOpenOrders = (data: Loadable<OrdersData>) =>
@@ -59,6 +58,7 @@ function getSimpleOrderStatus(status: OrderStatus) {
       return OrderStatus.Filled;
     default:
       assertNever(status);
+      // should never happen since we made OrderStatus manually
       return OrderStatus.Open;
   }
 }
@@ -128,32 +128,3 @@ function calculateMergedOrders(liveOrders: Loadable<OrdersData>, restOrders: Loa
       maxBy([a, b], (o) => MustBigNumber(o.updatedAtHeight ?? o.createdAtHeight).toNumber())!
   );
 }
-
-function mapLoadableData<T, R>(load: Loadable<T>, map: (obj: T) => R): Loadable<R> {
-  return {
-    ...load,
-    data: load.data != null ? map(load.data) : undefined,
-  } as Loadable<R>;
-}
-
-type SimpleMap<T> = { [key: string]: T };
-function mergeObjects<T>(one: SimpleMap<T>, two: SimpleMap<T>, merge: (a: T, b: T) => T) {
-  const finalObj: SimpleMap<T> = {};
-
-  [...Object.keys(one), ...Object.keys(two)].forEach((key) => {
-    if (finalObj[key] != null) {
-      return;
-    }
-    const obj = one[key];
-    const otherObj = two[key];
-    if (obj != null && otherObj != null) {
-      finalObj[key] = merge(obj, otherObj);
-    } else if (obj == null && otherObj == null) {
-      // do nothing
-    } else {
-      // we know one of them is non-null
-      finalObj[key] = (obj ?? otherObj)!;
-    }
-  });
-  return finalObj;
-}