Skip to content

Commit

Permalink
Fixed tsc issues block test suite
Browse files Browse the repository at this point in the history
  • Loading branch information
@alsco77
alsco77 committed Dec 4, 2020
1 parent aa04b0b commit 5d50460
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 27 deletions.
4 changes: 2 additions & 2 deletions test/masset/TestMassetCache.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ contract("Masset - Mint", async (accounts) => {
{ from: sa.default },
);
// 2. Deposit the mUSD
await systemMachine.savingsContract.depositSavings(new BN(1), {
await systemMachine.savingsContract.methods["depositSavings(uint256)"](new BN(1), {
from: sa.default,
});
await assertSwap(massetDetails, bAssets[1], bAssets[2], new BN(1), true);
Expand All @@ -397,7 +397,7 @@ contract("Masset - Mint", async (accounts) => {
{ from: recipient },
);
// 2. Deposit the mUSD
await systemMachine.savingsContract.depositSavings(new BN(1), {
await systemMachine.savingsContract.methods["depositSavings(uint256)"](new BN(1), {
from: recipient,
});
});
Expand Down
46 changes: 30 additions & 16 deletions test/savings/TestSavingsContract.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ contract("SavingsContract", async (accounts) => {
expect(stateBefore.exchangeRate).to.bignumber.equal(initialExchangeRate);

// Deposit first to get some savings in the basket
await savingsContract.methods["deposit(uint256)"](TEN_EXACT);
await savingsContract.methods["depositSavings(uint256)"](TEN_EXACT);

const stateMiddle = await getBalances(savingsContract, sa.default);
expect(stateMiddle.exchangeRate).to.bignumber.equal(initialExchangeRate);
Expand All @@ -190,7 +190,9 @@ contract("SavingsContract", async (accounts) => {
await masset.approve(savingsContract.address, TEN_EXACT, { from: sa.dummy2 });

// Dummy 2 deposits into the contract
await savingsContract.methods["deposit(uint256)"](TEN_EXACT, { from: sa.dummy2 });
await savingsContract.methods["depositSavings(uint256)"](TEN_EXACT, {
from: sa.dummy2,
});

const stateEnd = await getBalances(savingsContract, sa.default);
assertBNClose(stateEnd.exchangeRate, initialExchangeRate.muln(2), 1);
Expand All @@ -207,7 +209,7 @@ contract("SavingsContract", async (accounts) => {
});
it("should fail when amount is zero", async () => {
await expectRevert(
savingsContract.methods["deposit(uint256)"](ZERO),
savingsContract.methods["depositSavings(uint256)"](ZERO),
"Must deposit something",
);
});
Expand All @@ -218,7 +220,9 @@ contract("SavingsContract", async (accounts) => {

// Deposit
await expectRevert(
savingsContract.methods["deposit(uint256)"](TEN_EXACT, { from: sa.dummy1 }),
savingsContract.methods["depositSavings(uint256)"](TEN_EXACT, {
from: sa.dummy1,
}),
"ERC20: transfer amount exceeds balance",
);
});
Expand All @@ -237,7 +241,7 @@ contract("SavingsContract", async (accounts) => {
expect(initialExchangeRate).to.bignumber.equal(balancesBefore.exchangeRate);

// Deposit
const tx = await savingsContract.methods["deposit(uint256)"](TEN_EXACT);
const tx = await savingsContract.methods["depositSavings(uint256)"](TEN_EXACT);
const calcCreditIssued = underlyingToCredits(TEN_EXACT, initialExchangeRate);
expectEvent.inLogs(tx.logs, "SavingsDeposited", {
saver: sa.default,
Expand Down Expand Up @@ -268,7 +272,7 @@ contract("SavingsContract", async (accounts) => {
expect(initialExchangeRate).to.bignumber.equal(before.exchangeRate);

// Deposit
const tx = await savingsContract.methods["deposit(uint256)"](TEN_EXACT);
const tx = await savingsContract.methods["depositSavings(uint256)"](TEN_EXACT);
const calcCreditIssued = underlyingToCredits(TEN_EXACT, initialExchangeRate);
expectEvent.inLogs(tx.logs, "SavingsDeposited", {
saver: sa.default,
Expand Down Expand Up @@ -305,7 +309,7 @@ contract("SavingsContract", async (accounts) => {
expect(stateBefore.exchangeRate).to.bignumber.equal(initialExchangeRate);

// Deposit first to get some savings in the basket
await savingsContract.methods["deposit(uint256)"](TEN_EXACT);
await savingsContract.methods["depositSavings(uint256)"](TEN_EXACT);

const bal = await helper.getSaveBalance(savingsContract.address, sa.default);
expect(TEN_EXACT).bignumber.eq(bal);
Expand All @@ -314,7 +318,9 @@ contract("SavingsContract", async (accounts) => {
await masset.setAmountForCollectInterest(simpleToExactAmount(5, 18));
await masset.transfer(sa.dummy2, TEN_EXACT);
await masset.approve(savingsContract.address, TEN_EXACT, { from: sa.dummy2 });
await savingsContract.methods["deposit(uint256)"](TEN_EXACT, { from: sa.dummy2 });
await savingsContract.methods["depositSavings(uint256)"](TEN_EXACT, {
from: sa.dummy2,
});

const redeemInput = await helper.getSaveRedeemInput(savingsContract.address, TEN_EXACT);
const balBefore = await masset.balanceOf(sa.default);
Expand Down Expand Up @@ -374,7 +380,7 @@ contract("SavingsContract", async (accounts) => {
// // Deposit to SavingsContract
// await masset.approve(savingsContract.address, TEN_EXACT);
// await savingsContract.automateInterestCollectionFlag(false, { from: sa.governor });
// await savingsContract.methods["deposit(uint256)"](TEN_EXACT);
// await savingsContract.methods["depositSavings(uint256)"](TEN_EXACT);

// const balanceBefore = await masset.balanceOf(savingsContract.address);

Expand Down Expand Up @@ -432,7 +438,7 @@ contract("SavingsContract", async (accounts) => {

// Deposit tokens first
const balanceBeforeDeposit = await masset.balanceOf(savingsContract.address);
await savingsContract.methods["deposit(uint256)"](TEN_EXACT);
await savingsContract.methods["depositSavings(uint256)"](TEN_EXACT);
const balanceAfterDeposit = await masset.balanceOf(savingsContract.address);
expect(balanceBeforeDeposit.add(TEN_EXACT)).to.bignumber.equal(balanceAfterDeposit);

Expand Down Expand Up @@ -460,7 +466,7 @@ contract("SavingsContract", async (accounts) => {

// Deposit tokens first
const balanceBeforeDeposit = await masset.balanceOf(savingsContract.address);
await savingsContract.methods["deposit(uint256)"](TEN_EXACT);
await savingsContract.methods["depositSavings(uint256)"](TEN_EXACT);
const balanceAfterDeposit = await masset.balanceOf(savingsContract.address);
expect(balanceBeforeDeposit.add(TEN_EXACT)).to.bignumber.equal(balanceAfterDeposit);

Expand Down Expand Up @@ -521,20 +527,26 @@ contract("SavingsContract", async (accounts) => {
// interest remains unassigned and exchange rate unmoved
await masset.setAmountForCollectInterest(interestToReceive1);
await time.increase(ONE_DAY);
await savingsContract.methods["deposit(uint256)"](saver1deposit, { from: saver1 });
await savingsContract.methods["depositSavings(uint256)"](saver1deposit, {
from: saver1,
});
await savingsContract.pokeSurplus();
const state1 = await getBalances(savingsContract, saver1);
// 2.0 user 2 deposits
// interest rate benefits user 1 and issued user 2 less credits than desired
await masset.setAmountForCollectInterest(interestToReceive2);
await time.increase(ONE_DAY);
await savingsContract.methods["deposit(uint256)"](saver2deposit, { from: saver2 });
await savingsContract.methods["depositSavings(uint256)"](saver2deposit, {
from: saver2,
});
const state2 = await getBalances(savingsContract, saver2);
// 3.0 user 3 deposits
// interest rate benefits users 1 and 2
await masset.setAmountForCollectInterest(interestToReceive3);
await time.increase(ONE_DAY);
await savingsContract.methods["deposit(uint256)"](saver3deposit, { from: saver3 });
await savingsContract.methods["depositSavings(uint256)"](saver3deposit, {
from: saver3,
});
const state3 = await getBalances(savingsContract, saver3);
// 4.0 user 1 withdraws all her credits
await savingsContract.redeem(state1.userCredits, { from: saver1 });
Expand All @@ -551,7 +563,9 @@ contract("SavingsContract", async (accounts) => {
// interest rate benefits users 2 and 3
await masset.setAmountForCollectInterest(interestToReceive4);
await time.increase(ONE_DAY);
await savingsContract.methods["deposit(uint256)"](saver4deposit, { from: saver4 });
await savingsContract.methods["depositSavings(uint256)"](saver4deposit, {
from: saver4,
});
const state5 = await getBalances(savingsContract, saver4);
// 6.0 users 2, 3, and 4 withdraw all their tokens
await savingsContract.redeem(state2.userCredits, { from: saver2 });
Expand All @@ -577,7 +591,7 @@ contract("SavingsContract", async (accounts) => {
from: sa.default,
});
// 2. Deposit the mUSD
await savingsContract.methods["deposit(uint256)"](depositAmount, {
await savingsContract.methods["depositSavings(uint256)"](depositAmount, {
from: sa.default,
});
const expectedCredits = underlyingToCredits(depositAmount, initialExchangeRate);
Expand Down
9 changes: 0 additions & 9 deletions test/savings/TestSavingsManager.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const { expect } = envSetup.configure();
const SavingsManager = artifacts.require("SavingsManager");
const MockNexus = artifacts.require("MockNexus");
const MockMasset = artifacts.require("MockMasset");
const MockERC20 = artifacts.require("MockERC20");
const MockMasset1 = artifacts.require("MockMasset1");
const SavingsContract = artifacts.require("SavingsContract");
const MockRevenueRecipient = artifacts.require("MockRevenueRecipient");
Expand All @@ -47,20 +46,15 @@ contract("SavingsManager", async (accounts) => {
let savingsContract: t.SavingsContractInstance;
let savingsManager: t.SavingsManagerInstance;
let mUSD: t.MockMassetInstance;
let mta: t.MockERC20Instance;
const liquidator = sa.fundManager;

async function createNewSavingsManager(mintAmount: BN = INITIAL_MINT): Promise<void> {
mUSD = await MockMasset.new("mUSD", "mUSD", 18, sa.default, mintAmount);
mta = await MockERC20.new("MTA", "MTA", 18, sa.fundManager, 1000000);
savingsContract = await SavingsContract.new(
nexus.address,
mta.address,
sa.fundManager,
mUSD.address,
"Savings Credit",
"ymUSD",
18,
);
savingsManager = await SavingsManager.new(
nexus.address,
Expand Down Expand Up @@ -370,12 +364,9 @@ contract("SavingsManager", async (accounts) => {
const mUSD2 = await MockMasset1.new("mUSD", "mUSD", 18, sa.default, INITIAL_MINT);
savingsContract = await SavingsContract.new(
nexus.address,
mta.address,
sa.fundManager,
mUSD.address,
"Savings Credit",
"ymUSD",
18,
);
savingsManager = await SavingsManager.new(
nexus.address,
Expand Down

0 comments on commit 5d50460

Please sign in to comment.