Skip to content

Commit

Permalink
Revert "feat(inter-protocol)!: rename debtSnapshot.interest to stabil…
Browse files Browse the repository at this point in the history 
…ityFee"

This reverts commit 61b5be8.
  • Loading branch information
@turadg
turadg committed Jul 21, 2023
1 parent f5ce531 commit 9173458
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
14 changes: 7 additions & 7 deletions packages/inter-protocol/test/vaultFactory/snapshots/test-vaultFactory.js.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ Generated by [AVA](https://avajs.dev).
brand: Object @Alleged: IST brand {},
value: 473n,
},
stabilityFee: {
interest: {
denominator: {
brand: Object @Alleged: IST brand {},
value: 100n,
Expand All @@ -280,7 +280,7 @@ Generated by [AVA](https://avajs.dev).
brand: Object @Alleged: IST brand {},
value: 473n,
},
stabilityFee: {
interest: {
denominator: {
brand: Object @Alleged: IST brand {},
value: 100n,
Expand All @@ -306,7 +306,7 @@ Generated by [AVA](https://avajs.dev).
brand: Object @Alleged: IST brand {},
value: 53n,
},
stabilityFee: {
interest: {
denominator: {
brand: Object @Alleged: IST brand {},
value: 100n,
Expand All @@ -332,7 +332,7 @@ Generated by [AVA](https://avajs.dev).
brand: Object @Alleged: IST brand {},
value: 53n,
},
stabilityFee: {
interest: {
denominator: {
brand: Object @Alleged: IST brand {},
value: 100n,
Expand All @@ -358,7 +358,7 @@ Generated by [AVA](https://avajs.dev).
brand: Object @Alleged: IST brand {},
value: 473n,
},
stabilityFee: {
interest: {
denominator: {
brand: Object @Alleged: IST brand {},
value: 100n,
Expand All @@ -384,7 +384,7 @@ Generated by [AVA](https://avajs.dev).
brand: Object @Alleged: IST brand {},
value: 53n,
},
stabilityFee: {
interest: {
denominator: {
brand: Object @Alleged: IST brand {},
value: 100000000000000000000n,
Expand All @@ -410,7 +410,7 @@ Generated by [AVA](https://avajs.dev).
brand: Object @Alleged: IST brand {},
value: 0n,
},
stabilityFee: {
interest: {
denominator: {
brand: Object @Alleged: IST brand {},
value: 100000000000000000000n,
Expand Down
32 changes: 16 additions & 16 deletions packages/inter-protocol/test/vaultFactory/test-vaultFactory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ test('interest on multiple vaults', async t => {
const aliceUpdate = await E(aliceNotifier).getUpdateSince();
const bobUpdate = await E(bobNotifier).getUpdateSince();

// 160n is initial fee. stabilityFee is ~3n/week. compounding is in the noise.
// 160n is initial fee. interest is ~3n/week. compounding is in the noise.
const bobAddedDebt = 160n + 3n;
t.deepEqual(
calculateCurrentDebt(
Expand All @@ -509,7 +509,7 @@ test('interest on multiple vaults', async t => {
run.make(3200n + bobAddedDebt),
);

// 236 is the initial fee. stabilityFee is ~4n/week
// 236 is the initial fee. Interest is ~4n/week
const aliceAddedDebt = 236n + 4n;
t.deepEqual(
calculateCurrentDebt(
Expand All @@ -523,15 +523,15 @@ test('interest on multiple vaults', async t => {
// but no change to the snapshot
t.deepEqual(aliceUpdate.value.debtSnapshot, {
debt: run.make(4935n),
stabilityFee: makeRatio(100n, run.brand, 100n),
interest: makeRatio(100n, run.brand, 100n),
});

const rewardAllocation = await E(vaultFactory).getRewardAllocation();
const rewardRunCount = aliceAddedDebt + bobAddedDebt;
t.is(
rewardAllocation.Minted.value,
rewardRunCount,
// reward includes 5% fees on two loans plus 1% stabilityFee three times on each
// reward includes 5% fees on two loans plus 1% interest three times on each
`Should be ${rewardRunCount}, was ${rewardAllocation.Minted.value}`,
);

Expand All @@ -552,7 +552,7 @@ test('interest on multiple vaults', async t => {
// Advance another 7 days, past one charging and recording period
await manualTimer.tickN(8);

// open a vault when manager's stabilityFee already compounded
// open a vault when manager's interest already compounded
const wantedRun = 1_000n;
/** @type {UserSeat<VaultKit>} */
const danVaultSeat = await E(zoe).offer(
Expand Down Expand Up @@ -640,7 +640,7 @@ test('adjust balances', async t => {
t.deepEqual(aliceUpdate.value.debtSnapshot.debt, debtLevel);
t.deepEqual(aliceUpdate.value.debtSnapshot, {
debt: run.make(5250n),
stabilityFee: makeRatio(100n, run.brand),
interest: makeRatio(100n, run.brand),
});

// increase collateral 1 ///////////////////////////////////// (give both)
Expand Down Expand Up @@ -737,7 +737,7 @@ test('adjust balances', async t => {
t.deepEqual(aliceUpdate.value.debtSnapshot.debt, debtLevel);
t.deepEqual(aliceUpdate.value.debtSnapshot, {
debt: run.make(5253n),
stabilityFee: run.makeRatio(100n),
interest: run.makeRatio(100n),
});

// reduce collateral ///////////////////////////////////// (want both)
Expand Down Expand Up @@ -898,12 +898,12 @@ test('adjust balances - withdraw RUN', async t => {
t.deepEqual(aliceUpdate.value.debtSnapshot.debt, debtLevel);
});

test('adjust balances after stabilityFee charges', async t => {
test('adjust balances after interest charges', async t => {
const OPEN1 = 450n;
const AMPLE = 100_000n;
const { aeth, run } = t.context;

// charge stabilityFee on every tick
// charge interest on every tick
const manualTimer = buildManualTimer(trace, 0n, {
timeStep: SECONDS_PER_DAY,
});
Expand Down Expand Up @@ -940,7 +940,7 @@ test('adjust balances after stabilityFee charges', async t => {
);
const { vault } = await E(vaultSeat).getOfferResult();

trace('1. Charge stabilityFee');
trace('1. Charge interest');
await manualTimer.tick();
await manualTimer.tick();

Expand Down Expand Up @@ -1226,7 +1226,7 @@ test('collect fees from vault', async t => {
recordingPeriod: SECONDS_PER_WEEK,
};

// charge stabilityFee on every tick
// charge interest on every tick
const manualTimer = buildManualTimer(t.log, 0n, {
timeStep: SECONDS_PER_WEEK,
eventLoopIteration,
Expand Down Expand Up @@ -1529,7 +1529,7 @@ test('debt too small - MinInitialDebt', async t => {
* allow.
*
* Attempts to adjust balances on vaults beyond the debt limit fail. In other
* words, minting for anything other than charging stabilityFee fails.
* words, minting for anything other than charging interest fails.
*/
test('excessive debt on collateral type - debtLimit', async t => {
const { zoe, aeth, run } = t.context;
Expand Down Expand Up @@ -1825,7 +1825,7 @@ test('manager notifiers, with snapshot', async t => {
);
({ vault } = await E(vaultSeat).getOfferResult());

trace('6. Loan stabilityFee');
trace('6. Loan interest');
vaultSeat = await E(services.zoe).offer(
await E(E(vfPublic).getCollateralManager(aeth.brand)).makeVaultInvitation(),
harden({
Expand All @@ -1846,9 +1846,9 @@ test('manager notifiers, with snapshot', async t => {
});
m.addDebt(DEBT2);
await manualTimer.tickN(5);
const stabilityFeeAccrued = (await E(vault).getCurrentDebt()).value - DEBT1;
m.addDebt(stabilityFeeAccrued);
t.is(stabilityFeeAccrued, 9n);
const interestAccrued = (await E(vault).getCurrentDebt()).value - DEBT1;
m.addDebt(interestAccrued);
t.is(interestAccrued, 9n);

trace('7. make another loan to trigger a publish');
vaultSeat = await E(services.zoe).offer(
Expand Down
4 changes: 2 additions & 2 deletions packages/inter-protocol/test/vaultFactory/test-vaultLiquidation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ test('price drop', async t => {
t.is(notification.value.vaultState, Phase.ACTIVE);
t.deepEqual((await notification.value).debtSnapshot, {
debt: AmountMath.add(wantMinted, fee),
stabilityFee: makeRatio(100n, run.brand),
interest: makeRatio(100n, run.brand),
});
const { Minted: lentAmount } = await E(vaultSeat).getFinalAllocation();
t.truthy(AmountMath.isEqual(lentAmount, wantMinted), 'received 470 Minted');
Expand Down Expand Up @@ -2633,7 +2633,7 @@ test('refund to one of two loans', async t => {
t.is(aliceNotification.value.vaultState, Phase.ACTIVE);
t.deepEqual((await aliceNotification.value).debtSnapshot, {
debt: AmountMath.add(aliceWantMinted, aliceFee),
stabilityFee: makeRatio(100n, run.brand),
interest: makeRatio(100n, run.brand),
});
const { Minted: lentAmount } = await E(aliceVaultSeat).getFinalAllocation();
t.truthy(AmountMath.isEqual(lentAmount, aliceWantMinted));
Expand Down

0 comments on commit 9173458

Please sign in to comment.