Skip to content

Commit

Permalink
fix: Fix test and config files
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelmtzinf committed Feb 19, 2024
1 parent d0792ff commit ec5bd09
Show file tree
Hide file tree
Showing 10 changed files with 446 additions and 772 deletions.
File renamed without changes.
1,194 changes: 439 additions & 755 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
"devDependencies": {
"@aave/deploy-v3": "^1.55.3",
"@nomicfoundation/hardhat-toolbox": "^2.0.1",
"@nomicfoundation/hardhat-toolbox": "^2.0.2",
"@typechain/ethers-v5": "^10.0.0",
"@typechain/hardhat": "^6.0.0",
"@types/bluebird": "^3.5.38",
Expand All @@ -54,7 +54,7 @@
"eth-sig-util": "^3.0.1",
"ethereumjs-util": "^7.1.5",
"ethers": "^5.6.4",
"hardhat": "^2.9.3",
"hardhat": "^2.20.1",
"hardhat-contract-sizer": "^2.6.1",
"hardhat-deploy": "^0.11.22",
"hardhat-gas-reporter": "^1.0.9",
Expand Down
5 changes: 0 additions & 5 deletions setup-test-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ else
echo "[BASH] Skipping compilation to keep coverage artifacts"
fi

# Import external @aave/deploy artifacts
mkdir -p artifacts/deploy
# cp -r node_modules/@aave/deploy-v3/artifacts/* artifacts/deploy


# Export MARKET_NAME variable to use Aave market as testnet deployment setup
export MARKET_NAME="Test"

Expand Down
1 change: 0 additions & 1 deletion test/flashmint.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { ghoEntityConfig } from '../helpers/config';
import { mintErc20 } from './helpers/user-setup';
import './helpers/math/wadraymath';
import { evmRevert, evmSnapshot } from '../helpers/misc-utils';
import { keccak256, toUtf8Bytes } from 'ethers/lib/utils';

makeSuite('Gho FlashMinter', (testEnv: TestEnv) => {
let ethers;
Expand Down
2 changes: 1 addition & 1 deletion test/gho-atoken.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { impersonateAccountHardhat } from '../helpers/misc-utils';
import { makeSuite, TestEnv } from './helpers/make-suite';
import { ONE_ADDRESS, ZERO_ADDRESS } from '../helpers/constants';
import { GhoAToken__factory } from '../types';
import { ProtocolErrors } from '@aave/core-v3';
import { INITIALIZED, ZERO_ADDRESS_NOT_VALID } from './helpers/constants';
import { ProtocolErrors } from '@aave/core-v3';

makeSuite('Gho AToken End-To-End', (testEnv: TestEnv) => {
let ethers;
Expand Down
4 changes: 1 addition & 3 deletions test/gho-token-permit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ import hre from 'hardhat';
import { expect } from 'chai';
import { SignerWithAddress } from './helpers/make-suite';
import { GhoToken__factory, IGhoToken } from '../types';
import { HardhatEthersHelpers } from '@nomiclabs/hardhat-ethers/types';
import { BigNumber } from 'ethers';
import { HARDHAT_CHAINID, MAX_UINT_AMOUNT, ZERO_ADDRESS } from './../helpers/constants';
import { buildPermitParams, getSignatureFromTypedData } from './helpers/helpers';
import { keccak256, toUtf8Bytes } from 'ethers/lib/utils';

describe('GhoToken Unit Test', () => {
let ethers: typeof import('ethers/lib/ethers') & HardhatEthersHelpers;
let ethers;
let ghoTokenFactory: GhoToken__factory;

let users: SignerWithAddress[] = [];
Expand Down
3 changes: 1 addition & 2 deletions test/helpers/math/wadraymath.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { BigNumber } from '@ethersproject/bignumber';
import { BigNumberish } from 'ethers';
import { BigNumber, BigNumberish } from 'ethers';

import {
RAY,
Expand Down
3 changes: 1 addition & 2 deletions test/helpers/tokenization-events.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { ethers } from 'hardhat';
import { utils } from 'ethers';
import { TransactionReceipt } from '@ethersproject/providers';
import { GhoVariableDebtToken } from '../../types';

const GHO_VARIABLE_DEBT_TOKEN_EVENTS = [
Expand All @@ -21,7 +20,7 @@ const GHO_VARIABLE_DEBT_TOKEN_EVENTS = [

export const printVariableDebtTokenEvents = (
variableDebtToken: GhoVariableDebtToken,
receipt: TransactionReceipt
receipt: ethers.providers.TransactionReceipt
) => {
for (const eventSig of GHO_VARIABLE_DEBT_TOKEN_EVENTS) {
const eventName = eventSig.sig.split('(')[0];
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"noImplicitAny": false,
"resolveJsonModule": true
},
"include": ["./src/test", "./src/helpers", "./src/tasks", "./types", "./deploy"],
"include": ["./test", "./helpers", "./tasks", "./types", "./deploy"],
"files": ["./hardhat.config.ts"]
}

0 comments on commit ec5bd09

Please sign in to comment.