Removed UNI prefix, cleaned up

This commit is contained in:
Zer0dot 2020-12-30 01:04:06 -05:00
parent 57986b76a8
commit 4637476bbd
4 changed files with 29 additions and 49 deletions

View File

@ -215,13 +215,8 @@ export interface iAssetBase<T> {
USD: T; USD: T;
REN: T; REN: T;
ENJ: T; ENJ: T;
UNI_WETH: T; WETHDAI: T;
UNI_WBTC: T; WETHWBTC: T;
UNI_DAI: T;
UNI_USDC: T;
UNI_USDT: T;
UNI_WETHDAI: T;
UNI_WETHWBTC: T;
} }
export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>; export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>;
@ -254,13 +249,13 @@ export type iAavePoolAssets<T> = Pick<
export type iUniswapPoolAssets<T> = Pick< export type iUniswapPoolAssets<T> = Pick<
iAssetsWithoutUSD<T>, iAssetsWithoutUSD<T>,
| 'UNI_DAI' | 'DAI'
| 'UNI_USDC' | 'USDC'
| 'UNI_USDT' | 'USDT'
| 'UNI_WBTC' | 'WBTC'
| 'UNI_WETH' | 'WETH'
| 'UNI_WETHDAI' | 'WETHDAI'
| 'UNI_WETHWBTC' | 'WETHWBTC'
>; >;
export type iMultiPoolsAssets<T> = iAssetCommon<T> | iAavePoolAssets<T>; export type iMultiPoolsAssets<T> = iAssetCommon<T> | iAavePoolAssets<T>;
@ -291,13 +286,8 @@ export enum TokenContractId {
YFI = 'YFI', YFI = 'YFI',
UNI = 'UNI', UNI = 'UNI',
ENJ = 'ENJ', ENJ = 'ENJ',
UNI_WETH = 'WETH', WETHDAI = 'WETHDAI',
UNI_WBTC = 'WBTC', WETHWBTC = 'WETHWBTC',
UNI_DAI = 'DAI',
UNI_USDC = 'USDC',
UNI_USDT = 'USDT',
UNI_WETHDAI = 'WETHDAI',
UNI_WETHWBTC = 'WETHWBTC',
} }
export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams { export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {

View File

@ -23,13 +23,8 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
WBTC: oneEther.multipliedBy('47.332685').toFixed(), WBTC: oneEther.multipliedBy('47.332685').toFixed(),
YFI: oneEther.multipliedBy('22.407436').toFixed(), YFI: oneEther.multipliedBy('22.407436').toFixed(),
ZRX: oneEther.multipliedBy('0.001151').toFixed(), ZRX: oneEther.multipliedBy('0.001151').toFixed(),
UNI_WETH:oneEther.toFixed(), WETHDAI: oneEther.multipliedBy('22.407436').toFixed(),
UNI_WBTC: oneEther.multipliedBy('47.332685').toFixed(), WETHWBTC: oneEther.multipliedBy('22.407436').toFixed(),
UNI_DAI: oneEther.multipliedBy('0.00369068412860').toFixed(),
UNI_USDC: oneEther.multipliedBy('0.00367714136416').toFixed(),
UNI_USDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
UNI_WETHDAI: oneEther.multipliedBy('22.407436').toFixed(),
UNI_WETHWBTC: oneEther.multipliedBy('22.407436').toFixed(),
USD: '5848466240000000', USD: '5848466240000000',
}; };
// ---------------- // ----------------

View File

@ -23,13 +23,8 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
WBTC: oneEther.multipliedBy('47.332685').toFixed(), WBTC: oneEther.multipliedBy('47.332685').toFixed(),
YFI: oneEther.multipliedBy('22.407436').toFixed(), YFI: oneEther.multipliedBy('22.407436').toFixed(),
ZRX: oneEther.multipliedBy('0.001151').toFixed(), ZRX: oneEther.multipliedBy('0.001151').toFixed(),
UNI_WETH:oneEther.toFixed(), WETHDAI: oneEther.multipliedBy('22.407436').toFixed(),
UNI_WBTC: oneEther.multipliedBy('47.332685').toFixed(), WETHWBTC: oneEther.multipliedBy('22.407436').toFixed(),
UNI_DAI: oneEther.multipliedBy('0.00369068412860').toFixed(),
UNI_USDC: oneEther.multipliedBy('0.00367714136416').toFixed(),
UNI_USDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
UNI_WETHDAI: oneEther.multipliedBy('22.407436').toFixed(),
UNI_WETHWBTC: oneEther.multipliedBy('22.407436').toFixed(),
USD: '5848466240000000', USD: '5848466240000000',
}; };
// ---------------- // ----------------
@ -59,25 +54,25 @@ export const CommonsConfig: ICommonConfiguration = {
}, },
// TODO: reorg alphabetically, checking the reason of tests failing // TODO: reorg alphabetically, checking the reason of tests failing
LendingRateOracleRatesCommon: { LendingRateOracleRatesCommon: {
UNI_WETH: { WETH: {
borrowRate: oneRay.multipliedBy(0.03).toFixed(), borrowRate: oneRay.multipliedBy(0.03).toFixed(),
}, },
UNI_DAI: { DAI: {
borrowRate: oneRay.multipliedBy(0.039).toFixed(), borrowRate: oneRay.multipliedBy(0.039).toFixed(),
}, },
UNI_USDC: { USDC: {
borrowRate: oneRay.multipliedBy(0.039).toFixed(), borrowRate: oneRay.multipliedBy(0.039).toFixed(),
}, },
UNI_USDT: { USDT: {
borrowRate: oneRay.multipliedBy(0.035).toFixed(), borrowRate: oneRay.multipliedBy(0.035).toFixed(),
}, },
UNI_WBTC: { WBTC: {
borrowRate: oneRay.multipliedBy(0.03).toFixed(), borrowRate: oneRay.multipliedBy(0.03).toFixed(),
}, },
UNI_WETHDAI: { WETHDAI: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
UNI_WETHWBTC: { WETHWBTC: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
}, },

View File

@ -21,13 +21,13 @@ export const UniswapConfig: IUniswapConfiguration = {
MarketId: 'Uniswap V2 market', MarketId: 'Uniswap V2 market',
ProviderId: 2, ProviderId: 2,
ReservesConfig: { ReservesConfig: {
UNI_DAI: strategyDAI, DAI: strategyDAI,
UNI_USDC: strategyUSDC, USDC: strategyUSDC,
UNI_USDT: strategyUSDT, USDT: strategyUSDT,
UNI_WBTC: strategyWBTC, WBTC: strategyWBTC,
UNI_WETH: strategyWETH, WETH: strategyWETH,
UNI_WETHDAI: strategyWETHDAI, WETHDAI: strategyWETHDAI,
UNI_WETHWBTC: strategyWETHWBTC WETHWBTC: strategyWETHWBTC
}, },
ReserveAssets: { ReserveAssets: {
[eEthereumNetwork.buidlerevm]: {}, [eEthereumNetwork.buidlerevm]: {},