Merge pull request #143 from bancorprotocol/simplify-function-encodeRate

Simplify function `encodeRate`

src/utils/encoders.ts

@@ -10,7 +10,7 @@ function bitLength(value: BigNumber) {
 export const encodeRate = (value: Decimal) => {
   const data = DecToBn(value.sqrt().mul(ONE).floor());
   const length = bitLength(data.div(ONE));
-  return BnToDec(data.shr(length).shl(length));
+  return data.shr(length).shl(length);
 };
 
 export const decodeRate = (value: Decimal) => {
@@ -82,8 +82,8 @@ export const isOrderEncodable = (order: DecodedOrder) => {
 export const areScaledRatesEqual = (x: string, y: string): boolean => {
   const xDec = new Decimal(x);
   const yDec = new Decimal(y);
-  const xScaled = DecToBn(encodeRate(xDec));
-  const yScaled = DecToBn(encodeRate(yDec));
+  const xScaled = encodeRate(xDec);
+  const yScaled = encodeRate(yDec);
   return xScaled.eq(yScaled);
 };
 
@@ -97,9 +97,9 @@ export const encodeOrder = (
   const marginalRate = new Decimal(order.marginalRate);
 
   const y = DecToBn(liquidity);
-  const L = DecToBn(encodeRate(lowestRate));
-  const H = DecToBn(encodeRate(highestRate));
-  const M = DecToBn(encodeRate(marginalRate));
+  const L = encodeRate(lowestRate);
+  const H = encodeRate(highestRate);
+  const M = encodeRate(marginalRate);
 
   if (
     !(
@@ -155,11 +155,9 @@ export const calculateRequiredLiquidity = (
   vagueOrder: DecodedOrder
 ): string => {
   const z: BigNumber = calculateCorrelatedZ(knownOrder);
-  const L: BigNumber = DecToBn(encodeRate(new Decimal(vagueOrder.lowestRate)));
-  const H: BigNumber = DecToBn(encodeRate(new Decimal(vagueOrder.highestRate)));
-  const M: BigNumber = DecToBn(
-    encodeRate(new Decimal(vagueOrder.marginalRate))
-  );
+  const L: BigNumber = encodeRate(new Decimal(vagueOrder.lowestRate));
+  const H: BigNumber = encodeRate(new Decimal(vagueOrder.highestRate));
+  const M: BigNumber = encodeRate(new Decimal(vagueOrder.marginalRate));
 
   return z.mul(M.sub(L)).div(H.sub(L)).toString();
 };