From 770baa6da4b48d0042484a0e19eef1e1b4d8f5b6 Mon Sep 17 00:00:00 2001
From: alsco77 <alsco77@pm.me>
Date: Mon, 22 Feb 2021 13:11:52 +0000
Subject: [PATCH] Fix test env

---
 test-utils/machines/feederMachine.ts |  8 ++++----
 test/feeders/basic-fns.spec.ts       | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test-utils/machines/feederMachine.ts b/test-utils/machines/feederMachine.ts
index f6f3eb1e..f37c4c18 100644
--- a/test-utils/machines/feederMachine.ts
+++ b/test-utils/machines/feederMachine.ts
@@ -4,7 +4,7 @@
 import { Signer } from "ethers"
 import { ethers } from "hardhat"
 import {
-    InvariantValidator__factory,
+    FeederValidator__factory,
     MockInvariantValidator__factory,
     AssetProxy__factory,
     MockNexus__factory,
@@ -23,7 +23,7 @@ import {
     MockInitializableToken__factory,
     MockInitializableTokenWithFee__factory,
     Manager,
-    AssetProxy,
+    FeederValidator,
     FeederPool,
     FeederPool__factory,
 } from "types/generated"
@@ -36,7 +36,7 @@ import { MassetMachine, MassetDetails } from "./mAssetMachine"
 
 export interface FeederDetails {
     pool?: FeederPool
-    validator?: InvariantValidator
+    validator?: FeederValidator
     mAsset?: MockERC20
     fAsset?: MockERC20
     // [0] = mAsset
@@ -69,7 +69,7 @@ export class FeederMachine {
 
         const bBtc = await this.mAssetMachine.loadBassetProxy("Binance BTC", "bBTC", 18)
         const bAssets = [mAssetDetails.mAsset as MockERC20, bBtc]
-        const validator = await new InvariantValidator__factory(this.sa.default.signer).deploy(
+        const validator = await new FeederValidator__factory(this.sa.default.signer).deploy(
             simpleToExactAmount(1, 24),
             simpleToExactAmount(1, 24),
         )
diff --git a/test/feeders/basic-fns.spec.ts b/test/feeders/basic-fns.spec.ts
index 88a6897c..5ff53bb4 100644
--- a/test/feeders/basic-fns.spec.ts
+++ b/test/feeders/basic-fns.spec.ts
@@ -5,7 +5,7 @@ import { assertBNClosePercent } from "@utils/assertions"
 import { simpleToExactAmount } from "@utils/math"
 import { MassetDetails, MassetMachine, StandardAccounts, FeederMachine, FeederDetails } from "@utils/machines"
 
-describe("Feeder Pools", () => {
+describe.only("Feeder Pools", () => {
     let sa: StandardAccounts
     let feederMachine: FeederMachine
     let details: MassetDetails
@@ -65,7 +65,7 @@ describe("Feeder Pools", () => {
             await pool.mint(bAssets[1].address, approval, simpleToExactAmount(95), sa.default.address)
         })
     })
-    describe.only("testing some swaps", () => {
+    describe("testing some swaps", () => {
         before(async () => {
             await runSetup()
         })
@@ -73,21 +73,21 @@ describe("Feeder Pools", () => {
             const { pool, mAsset, fAsset } = feeder
             // Swap mAsset -> fAsset
             const approval = await feederMachine.approveFeeder(mAsset, pool.address, 10)
-            await pool.swap2(mAsset.address, fAsset.address, approval, simpleToExactAmount("9.5"), sa.default.address)
+            await pool.swap(mAsset.address, fAsset.address, approval, simpleToExactAmount("9.5"), sa.default.address)
         })
         it("should swap into mpAsset", async () => {
             const { pool, fAsset, mAssetDetails } = feeder
             const { bAssets } = mAssetDetails
             // fAsset -> mpAsset
             const approval = await feederMachine.approveFeeder(fAsset, pool.address, 10)
-            await pool.swap2(fAsset.address, bAssets[0].address, approval, simpleToExactAmount("9.5"), sa.default.address)
+            await pool.swap(fAsset.address, bAssets[0].address, approval, simpleToExactAmount("9.5"), sa.default.address)
         })
         it("should swap out of mpAsset", async () => {
             const { pool, fAsset, mAssetDetails } = feeder
             const { bAssets } = mAssetDetails
             // mpAsset -> fAsset
             const approval = await feederMachine.approveFeeder(bAssets[0], pool.address, 10)
-            await pool.swap2(bAssets[0].address, fAsset.address, approval, simpleToExactAmount("9.5"), sa.default.address)
+            await pool.swap(bAssets[0].address, fAsset.address, approval, simpleToExactAmount("9.5"), sa.default.address)
         })
     })
 })