Skip to content

Commit

Permalink
tests .prettier format diffs
Browse files Browse the repository at this point in the history
  • Loading branch information
@tjcloa
tjcloa committed Apr 22, 2021
1 parent 1553f38 commit 5ca2e06
Show file tree
Hide file tree
Showing 4 changed files with 255 additions and 277 deletions.
110 changes: 51 additions & 59 deletions tests-js/loan-settings/LoanSettings.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { assert } = require("chai");
const { expectRevert, expectEvent, constants, BN, balance, time, ether} = require("@openzeppelin/test-helpers");
const { expectRevert, expectEvent, constants, BN, balance, time, ether } = require("@openzeppelin/test-helpers");

const TestToken = artifacts.require("TestToken");
const TestWrbtc = artifacts.require("TestWrbtc");
Expand Down Expand Up @@ -30,16 +30,14 @@ contract("LoanSettings", (accounts) => {
let lender, account1, account2, account3, account4;
let underlyingToken, testWrbtc;
let sovryn, loanToken;
let loanParams, loanParamsId;

let loanParams, loanParamsId;

before(async () => {
[lender, account1, account2, account3, account4, ...accounts] = accounts;
});


beforeEach(async () => {
//Token
//Token
underlyingToken = await TestToken.new(name, symbol, 18, TOTAL_SUPPLY);
testWrbtc = await TestWrbtc.new();

Expand Down Expand Up @@ -79,78 +77,72 @@ contract("LoanSettings", (accounts) => {

await testWrbtc.mint(sovryn.address, ether("500"));

loanParams = {
"id": "0x0000000000000000000000000000000000000000000000000000000000000000",
"active": false,
"owner": constants.ZERO_ADDRESS,
"loanToken": underlyingToken.address,
"collateralToken": testWrbtc.address,
"minInitialMargin": ether("50"),
"maintenanceMargin": ether("15"),
"maxLoanTerm": "2419200"
};
let tx = await sovryn.setupLoanParams([Object.values(loanParams)]);
loanParamsId = tx.logs[1].args.id;
loanParams = {
id: "0x0000000000000000000000000000000000000000000000000000000000000000",
active: false,
owner: constants.ZERO_ADDRESS,
loanToken: underlyingToken.address,
collateralToken: testWrbtc.address,
minInitialMargin: ether("50"),
maintenanceMargin: ether("15"),
maxLoanTerm: "2419200",
};

let tx = await sovryn.setupLoanParams([Object.values(loanParams)]);
loanParamsId = tx.logs[1].args.id;
});


describe("test LoanSettings", async () => {
it("test setup removeLoanParams", async () => {
let loanParamsAfter = (await sovryn.getLoanParams([loanParamsId]))[0];

assert(loanParamsAfter["id"] != "0x0");
assert(loanParamsAfter["active"]);
assert(loanParamsAfter["owner"] == lender);
assert(loanParamsAfter["loanToken"] == underlyingToken.address);


await expectRevert(sovryn.disableLoanParams([loanParamsId], { "from": accounts[0] }), "unauthorized owner");

await sovryn.disableLoanParams([loanParamsId], { "from": lender });
assert((await sovryn.getLoanParams([loanParamsId]))[0]["id"] != "0x0");
});
let loanParamsAfter = (await sovryn.getLoanParams([loanParamsId]))[0];


it("test disableLoanParams", async () => {
await sovryn.disableLoanParams([loanParamsId], { "from": lender });
assert(loanParamsAfter["id"] != "0x0");
assert(loanParamsAfter["active"]);
assert(loanParamsAfter["owner"] == lender);
assert(loanParamsAfter["loanToken"] == underlyingToken.address);

let loanParamsAfter = (await sovryn.getLoanParams([loanParamsId]))[0];
await expectRevert(sovryn.disableLoanParams([loanParamsId], { from: accounts[0] }), "unauthorized owner");

assert(loanParamsAfter["id"] != "0x0");
assert(loanParamsAfter["active"] == false); // false because we disabled Loan Param just before
assert(loanParamsAfter["owner"] == lender);
assert(loanParamsAfter["loanToken"] == underlyingToken.address);
assert(loanParamsAfter["collateralToken"] == testWrbtc.address);
assert(loanParamsAfter["minInitialMargin"] == ether("50"));
assert(loanParamsAfter["maintenanceMargin"] == ether("15"));
assert(loanParamsAfter["maxLoanTerm"] == "2419200");
await sovryn.disableLoanParams([loanParamsId], { from: lender });
assert((await sovryn.getLoanParams([loanParamsId]))[0]["id"] != "0x0");
});

it("test disableLoanParams", async () => {
await sovryn.disableLoanParams([loanParamsId], { from: lender });

it("test getLoanParams", async () => {
let loanParamsAfter = (await sovryn.getLoanParams([loanParamsId]))[0];
let loanParamsAfter = (await sovryn.getLoanParams([loanParamsId]))[0];

assert(loanParamsAfter["id"] != "0x0");
assert(loanParamsAfter["active"]);
assert(loanParamsAfter["owner"] == lender);
assert(loanParamsAfter["loanToken"] == underlyingToken.address);
assert(loanParamsAfter["collateralToken"] == testWrbtc.address);
assert(loanParamsAfter["minInitialMargin"] == ether("50"));
assert(loanParamsAfter["maintenanceMargin"] == ether("15"));
assert(loanParamsAfter["maxLoanTerm"] == "2419200");
assert(loanParamsAfter["id"] != "0x0");
assert(loanParamsAfter["active"] == false); // false because we disabled Loan Param just before
assert(loanParamsAfter["owner"] == lender);
assert(loanParamsAfter["loanToken"] == underlyingToken.address);
assert(loanParamsAfter["collateralToken"] == testWrbtc.address);
assert(loanParamsAfter["minInitialMargin"] == ether("50"));
assert(loanParamsAfter["maintenanceMargin"] == ether("15"));
assert(loanParamsAfter["maxLoanTerm"] == "2419200");
});

it("test getLoanParams", async () => {
let loanParamsAfter = (await sovryn.getLoanParams([loanParamsId]))[0];

assert(loanParamsAfter["id"] != "0x0");
assert(loanParamsAfter["active"]);
assert(loanParamsAfter["owner"] == lender);
assert(loanParamsAfter["loanToken"] == underlyingToken.address);
assert(loanParamsAfter["collateralToken"] == testWrbtc.address);
assert(loanParamsAfter["minInitialMargin"] == ether("50"));
assert(loanParamsAfter["maintenanceMargin"] == ether("15"));
assert(loanParamsAfter["maxLoanTerm"] == "2419200");
});

it("test getLoanParamsList", async () => {
let loanParamsList = await sovryn.getLoanParamsList(lender, 0, 1);
assert(loanParamsList[0] == loanParamsId);
let loanParamsList = await sovryn.getLoanParamsList(lender, 0, 1);
assert(loanParamsList[0] == loanParamsId);
});


it("test getTotalPrincipal", async () => {
let totalPrincipal = await sovryn.getTotalPrincipal(lender, underlyingToken.address);
assert(totalPrincipal == 0);
let totalPrincipal = await sovryn.getTotalPrincipal(lender, underlyingToken.address);
assert(totalPrincipal == 0);
});
});
});
80 changes: 36 additions & 44 deletions tests-js/loan-settings/LoanSettingsEvents.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { assert } = require("chai");
const { expectRevert, expectEvent, constants, BN, balance, time, ether} = require("@openzeppelin/test-helpers");
const { expectRevert, expectEvent, constants, BN, balance, time, ether } = require("@openzeppelin/test-helpers");

const TestToken = artifacts.require("TestToken");
const TestWrbtc = artifacts.require("TestWrbtc");
Expand Down Expand Up @@ -30,16 +30,14 @@ contract("LoanSettingsEvents", (accounts) => {
let lender, account1, account2, account3, account4;
let underlyingToken, testWrbtc;
let sovryn, loanToken;
let loanParams, loanParamsId, tx;

let loanParams, loanParamsId, tx;

before(async () => {
[lender, account1, account2, account3, account4, ...accounts] = accounts;
});


beforeEach(async () => {
//Token
//Token
underlyingToken = await TestToken.new(name, symbol, 18, TOTAL_SUPPLY);
testWrbtc = await TestWrbtc.new();

Expand Down Expand Up @@ -79,59 +77,53 @@ contract("LoanSettingsEvents", (accounts) => {

await testWrbtc.mint(sovryn.address, ether("500"));

loanParams = {
"id": "0x0000000000000000000000000000000000000000000000000000000000000000",
"active": false,
"owner": constants.ZERO_ADDRESS,
"loanToken": underlyingToken.address,
"collateralToken": testWrbtc.address,
"minInitialMargin": ether("50"),
"maintenanceMargin": ether("15"),
"maxLoanTerm": "2419200"
};
});


loanParams = {
id: "0x0000000000000000000000000000000000000000000000000000000000000000",
active: false,
owner: constants.ZERO_ADDRESS,
loanToken: underlyingToken.address,
collateralToken: testWrbtc.address,
minInitialMargin: ether("50"),
maintenanceMargin: ether("15"),
maxLoanTerm: "2419200",
};
});

describe("test LoanSettingsEvents", async () => {
it("test setupLoanParamsEvents", async () => {
tx = await sovryn.setupLoanParams([Object.values(loanParams)]);
tx = await sovryn.setupLoanParams([Object.values(loanParams)]);

await expectEvent(tx, "LoanParamsIdSetup", {owner: lender});
await expectEvent(tx, "LoanParamsIdSetup", { owner: lender });
assert(tx.logs[1]["id"] != "0x0");

await expectEvent(tx, "LoanParamsSetup",
{
owner: lender,
loanToken: underlyingToken.address,
collateralToken: testWrbtc.address,
minInitialMargin: ether("50"),
maintenanceMargin: ether("15"),
maxLoanTerm: "2419200"
}
);
await expectEvent(tx, "LoanParamsSetup", {
owner: lender,
loanToken: underlyingToken.address,
collateralToken: testWrbtc.address,
minInitialMargin: ether("50"),
maintenanceMargin: ether("15"),
maxLoanTerm: "2419200",
});
assert(tx.logs[0]["id"] != "0x0");
});


it("test disableLoanParamsEvents", async () => {
it("test disableLoanParamsEvents", async () => {
tx = await sovryn.setupLoanParams([Object.values(loanParams)]);
loanParamsId = tx.logs[1].args.id;

tx = await sovryn.disableLoanParams([loanParamsId], { "from": lender });
tx = await sovryn.disableLoanParams([loanParamsId], { from: lender });

await expectEvent(tx, "LoanParamsIdDisabled", {owner: lender});
await expectEvent(tx, "LoanParamsIdDisabled", { owner: lender });
assert(tx.logs[1]["id"] != "0x0");

await expectEvent(tx, "LoanParamsDisabled",
{
owner: lender,
loanToken: underlyingToken.address,
collateralToken: testWrbtc.address,
minInitialMargin: ether("50"),
maintenanceMargin: ether("15"),
maxLoanTerm: "2419200"
}
);
await expectEvent(tx, "LoanParamsDisabled", {
owner: lender,
loanToken: underlyingToken.address,
collateralToken: testWrbtc.address,
minInitialMargin: ether("50"),
maintenanceMargin: ether("15"),
maxLoanTerm: "2419200",
});
assert(tx.logs[0]["id"] != "0x0");
});
});
Expand Down
45 changes: 20 additions & 25 deletions tests-js/loan-settings/LoanSettingsNegative.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { assert } = require("chai");
const { expectRevert, expectEvent, constants, BN, balance, time, ether} = require("@openzeppelin/test-helpers");
const { expectRevert, expectEvent, constants, BN, balance, time, ether } = require("@openzeppelin/test-helpers");

const TestToken = artifacts.require("TestToken");
const TestWrbtc = artifacts.require("TestWrbtc");
Expand Down Expand Up @@ -30,16 +30,14 @@ contract("LoanSettingsNegative", (accounts) => {
let lender, account1, account2, account3, account4;
let underlyingToken, testWrbtc;
let sovryn, loanToken;
let loanParams, loanParamsId, tx;

let loanParams, loanParamsId, tx;

before(async () => {
[lender, account1, account2, account3, account4, ...accounts] = accounts;
});


beforeEach(async () => {
//Token
//Token
underlyingToken = await TestToken.new(name, symbol, 18, TOTAL_SUPPLY);
testWrbtc = await TestWrbtc.new();

Expand Down Expand Up @@ -79,34 +77,31 @@ contract("LoanSettingsNegative", (accounts) => {

await testWrbtc.mint(sovryn.address, ether("500"));

loanParams = {
"id": "0x0000000000000000000000000000000000000000000000000000000000000000",
"active": false,
"owner": constants.ZERO_ADDRESS,
"loanToken": underlyingToken.address,
"collateralToken": testWrbtc.address,
"minInitialMargin": ether("50"),
"maintenanceMargin": ether("15"),
"maxLoanTerm": "2419200"
};
loanParams = {
id: "0x0000000000000000000000000000000000000000000000000000000000000000",
active: false,
owner: constants.ZERO_ADDRESS,
loanToken: underlyingToken.address,
collateralToken: testWrbtc.address,
minInitialMargin: ether("50"),
maintenanceMargin: ether("15"),
maxLoanTerm: "2419200",
};

tx = await sovryn.setupLoanParams([Object.values(loanParams)]);
loanParamsId = tx.logs[1].args.id;
});
loanParamsId = tx.logs[1].args.id;
});


describe("test LoanSettingsNegative", async () => {
it("test disable unauthorized owner LoanSettings", async () => {
await expectRevert(sovryn.disableLoanParams([loanParamsId], { "from": account1 }), "unauthorized owner");
await expectRevert(sovryn.disableLoanParams([loanParamsId], { from: account1 }), "unauthorized owner");
});


it("test LoanSettings loanParam exists", async () => {
await expectRevert(sovryn.setupLoanParams([Object.values(loanParams), Object.values(loanParams)]), "loanParams exists");
});


it("test LoanSettings other requires", async () => {
it("test LoanSettings other requires", async () => {
let localLoanParams;

localLoanParams = JSON.parse(JSON.stringify(loanParams));
Expand All @@ -117,18 +112,18 @@ contract("LoanSettingsNegative", (accounts) => {

localLoanParams = JSON.parse(JSON.stringify(loanParams));
localLoanParams["minInitialMargin"] = ether("50");
localLoanParams["maintenanceMargin"] = ether("15");
localLoanParams["maintenanceMargin"] = ether("15");
localLoanParams["collateralToken"] = constants.ZERO_ADDRESS;
await expectRevert(sovryn.setupLoanParams([Object.values(localLoanParams)]), "invalid params");

localLoanParams = JSON.parse(JSON.stringify(loanParams));
localLoanParams["maintenanceMargin"] = ether("15");
localLoanParams["maintenanceMargin"] = ether("15");
localLoanParams["minInitialMargin"] = ether("10");
await expectRevert(sovryn.setupLoanParams([Object.values(localLoanParams)]), "invalid params");

localLoanParams = JSON.parse(JSON.stringify(loanParams));
localLoanParams["minInitialMargin"] = ether("50");
localLoanParams["maintenanceMargin"] = ether("15");
localLoanParams["maintenanceMargin"] = ether("15");
localLoanParams["maxLoanTerm"] = 1;
await expectRevert(sovryn.setupLoanParams([Object.values(localLoanParams)]), "invalid params");
});
Expand Down
Loading

0 comments on commit 5ca2e06

Please sign in to comment.