Merge branch '196-fix-certora-ci' into 'master'

Resolve "Fix Certora CI"

Closes #196

See merge request aave-tech/protocol-v2!218
This commit is contained in:
Ernesto Boado 2021-01-19 11:07:01 +00:00
commit b21dd83abb
2 changed files with 7 additions and 5 deletions

View File

@ -37,6 +37,6 @@ certora-test:
- mv solc-static-linux /usr/bin/solc - mv solc-static-linux /usr/bin/solc
- export PATH=$PATH:/usr/bin/solc/solc-static-linux - export PATH=$PATH:/usr/bin/solc/solc-static-linux
script: script:
- certoraRun specs/harness/StableDebtTokenHarness.sol:StableDebtTokenHarness --solc_args '--optimize' --verify StableDebtTokenHarness:specs/StableDebtToken.spec --settings -assumeUnwindCond,-b=4 --cache StableDebtToken --cloud - certoraRun specs/harness/StableDebtTokenHarness.sol:StableDebtTokenHarness --solc_args "['--optimize']" --verify StableDebtTokenHarness:specs/StableDebtToken.spec --settings -assumeUnwindCond,-b=4 --cache StableDebtToken --cloud
- certoraRun specs/harness/UserConfigurationHarness.sol --verify UserConfigurationHarness:specs/UserConfiguration.spec --solc_args '--optimize' --settings -useBitVectorTheory --cache UserConfiguration --cloud - certoraRun specs/harness/UserConfigurationHarness.sol --verify UserConfigurationHarness:specs/UserConfiguration.spec --solc_args "['--optimize']" --settings -useBitVectorTheory --cache UserConfiguration --cloud
- certoraRun contracts/protocol/tokenization/VariableDebtToken.sol:VariableDebtToken specs/harness/LendingPoolHarnessForVariableDebtToken.sol --solc_args '--optimize' --link VariableDebtToken:POOL=LendingPoolHarnessForVariableDebtToken --verify VariableDebtToken:specs/VariableDebtToken.spec --settings -assumeUnwindCond,-useNonLinearArithmetic,-b=4 --cache VariableDebtToken --cloud - certoraRun contracts/protocol/tokenization/VariableDebtToken.sol:VariableDebtToken specs/harness/LendingPoolHarnessForVariableDebtToken.sol --solc_args "['--optimize']" --link VariableDebtToken:POOL=LendingPoolHarnessForVariableDebtToken --verify VariableDebtToken:specs/VariableDebtToken.spec --settings -assumeUnwindCond,-useNonLinearArithmetic,-b=4 --cache VariableDebtToken --cloud

View File

@ -128,7 +128,9 @@ export const approve = async (reserveSymbol: string, user: SignerWithAddress, te
const token = await getMintableERC20(reserve); const token = await getMintableERC20(reserve);
await token.connect(user.signer).approve(pool.address, '100000000000000000000000000000'); await waitForTx(
await token.connect(user.signer).approve(pool.address, '100000000000000000000000000000')
);
}; };
export const deposit = async ( export const deposit = async (
@ -314,7 +316,7 @@ export const delegateBorrowAllowance = async (
await expect(delegateAllowancePromise, revertMessage).to.be.revertedWith(revertMessage); await expect(delegateAllowancePromise, revertMessage).to.be.revertedWith(revertMessage);
return; return;
} else { } else {
await delegateAllowancePromise; await waitForTx(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,