Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed scenarios, tests, removed console.log

Browse Source
This commit is contained in:
emilio 2020-11-04 11:12:26 +01:00
parent 4e4fbe6539
commit add6cad5c3
4 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/tokenization/StableDebtToken.sol
View File

@ -5,7 +5,6 @@ import {DebtTokenBase} from './base/DebtTokenBase.sol';
import {MathUtils} from '../libraries/math/MathUtils.sol'; import {MathUtils} from '../libraries/math/MathUtils.sol';
import {WadRayMath} from '../libraries/math/WadRayMath.sol'; import {WadRayMath} from '../libraries/math/WadRayMath.sol';
import {IStableDebtToken} from './interfaces/IStableDebtToken.sol'; import {IStableDebtToken} from './interfaces/IStableDebtToken.sol';
import '@nomiclabs/buidler/console.sol';
/** /**
* @title contract StableDebtToken * @title contract StableDebtToken
@ -107,8 +106,6 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
_decreaseBorrowAllowance(onBehalfOf, user, amount); _decreaseBorrowAllowance(onBehalfOf, user, amount);
} }
console.log('Invoked mint for %s and %s', user, onBehalfOf);
//cumulates the user debt //cumulates the user debt
(, uint256 currentBalance, uint256 balanceIncrease) = _calculateBalanceIncrease(onBehalfOf); (, uint256 currentBalance, uint256 balanceIncrease) = _calculateBalanceIncrease(onBehalfOf);

8
test/helpers/actions.ts
View File

@ -302,7 +302,7 @@ export const delegateBorrowAllowance = async (
const reserveData = await pool.getReserveData(reserveAddress); const reserveData = await pool.getReserveData(reserveAddress);
const debtToken = const debtToken =
interestRateMode === 'stable' interestRateMode === '1'
? await getStableDebtToken(reserveData.stableDebtTokenAddress) ? await getStableDebtToken(reserveData.stableDebtTokenAddress)
: await getVariableDebtToken(reserveData.variableDebtTokenAddress); : await getVariableDebtToken(reserveData.variableDebtTokenAddress);
@ -310,15 +310,15 @@ export const delegateBorrowAllowance = async (
.connect(user.signer) .connect(user.signer)
.approveDelegation(receiver, amountToDelegate); .approveDelegation(receiver, amountToDelegate);
if (expectedResult === 'revert') { if (expectedResult === 'revert' && revertMessage) {
await expect(delegateAllowancePromise, revertMessage).to.be.reverted; await expect(delegateAllowancePromise, revertMessage).to.be.revertedWith(revertMessage);
return; return;
} else { } else {
await delegateAllowancePromise; await delegateAllowancePromise;
const allowance = await debtToken.borrowAllowance(user.address, receiver); const allowance = await debtToken.borrowAllowance(user.address, receiver);
expect(allowance.toString()).to.be.equal( expect(allowance.toString()).to.be.equal(
amountToDelegate, amountToDelegate,
'borrowAllowance are set incorrectly' 'borrowAllowance is set incorrectly'
); );
} }
}; };

21
test/helpers/scenarios/credit-delegation.json
View File

@ -68,7 +68,7 @@
"borrowRateMode": "stable" "borrowRateMode": "stable"
}, },
"expected": "revert", "expected": "revert",
"revertMessage": "54" "revertMessage": "59"
} }
] ]
}, },
@ -96,7 +96,7 @@
"borrowRateMode": "variable" "borrowRateMode": "variable"
}, },
"expected": "revert", "expected": "revert",
"revertMessage": "54" "revertMessage": "59"
} }
] ]
}, },
@ -126,23 +126,6 @@
"expected": "success" "expected": "success"
} }
] ]
},
{
"description": "User 0 delegates borrowing of 1 WETH to user 2 with wrong borrowRateMode, revert expected",
"actions": [
{
"name": "delegateBorrowAllowance",
"args": {
"reserve": "WETH",
"amount": "1",
"user": "0",
"borrowRateMode": "random",
"toUser": "2"
},
"expected": "revert",
"revertMessage": "8"
}
]
} }
] ]
} }

2
test/scenario.spec.ts
View File

@ -10,7 +10,7 @@ import {executeStory} from './helpers/scenario-engine';
const scenarioFolder = './test/helpers/scenarios/'; const scenarioFolder = './test/helpers/scenarios/';
const selectedScenarios: string[] = [`credit-delegation.json`]; const selectedScenarios: string[] = [];
fs.readdirSync(scenarioFolder).forEach((file) => { fs.readdirSync(scenarioFolder).forEach((file) => {
if (selectedScenarios.length > 0 && !selectedScenarios.includes(file)) return; if (selectedScenarios.length > 0 && !selectedScenarios.includes(file)) return;