Skip to content

Commit d5d1415

Browse files
miguelmtzinfcedephrase
andauthored
fix: Reorganize directory structure (aave#328)
* fix: Reorganize dir structure * fix: test hardhat/package config fixes --------- Co-authored-by: cedephrase <[email protected]>
1 parent 31eccec commit d5d1415

File tree

73 files changed

+48
-61
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+48
-61
lines changed

.solcover.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
module.exports = {
2-
skipFiles: [
3-
'test/',
4-
'facilitators/aave/dependencies',
5-
'facilitators/aave/mocks',
6-
'facilitators/aave/poolUpgrade/',
7-
'facilitators/aave/stkAaveUpgrade/',
8-
'facilitators/flashMinter/mocks',
9-
'foundry-test/',
10-
],
2+
skipFiles: [],
113
mocha: {
124
enableTimeouts: false,
135
},

deploy/02_deploy_gho_atoken.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DeployFunction } from 'hardhat-deploy/types';
22
import { getPool } from '@aave/deploy-v3/dist/helpers/contract-getters';
3-
import { ZERO_ADDRESS } from '../src/helpers/constants';
3+
import { ZERO_ADDRESS } from '../helpers/constants';
44
import { GhoAToken } from '../types';
55

66
const func: DeployFunction = async function ({ getNamedAccounts, deployments, ...hre }) {

deploy/03_deploy_gho_stable_debt.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DeployFunction } from 'hardhat-deploy/types';
22
import { getPool } from '@aave/deploy-v3/dist/helpers/contract-getters';
3-
import { ZERO_ADDRESS } from '../src/helpers/constants';
3+
import { ZERO_ADDRESS } from '../helpers/constants';
44

55
const func: DeployFunction = async function ({ getNamedAccounts, deployments, ...hre }) {
66
const { deploy } = deployments;

deploy/04_deploy_gho_variable_debt.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DeployFunction } from 'hardhat-deploy/types';
22
import { getPool } from '@aave/deploy-v3/dist/helpers/contract-getters';
3-
import { ZERO_ADDRESS } from '../src/helpers/constants';
3+
import { ZERO_ADDRESS } from '../helpers/constants';
44

55
const func: DeployFunction = async function ({ getNamedAccounts, deployments, ...hre }) {
66
const { deploy } = deployments;

deploy/05_deploy_gho_interest_rate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DeployFunction } from 'hardhat-deploy/types';
2-
import { ghoReserveConfig } from '../src/helpers/config';
2+
import { ghoReserveConfig } from '../helpers/config';
33
import { getPoolAddressesProvider } from '@aave/deploy-v3/dist/helpers/contract-getters';
44

55
const func: DeployFunction = async function ({ getNamedAccounts, deployments, ...hre }) {

deploy/08_deploy_gho_flashminter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { HardhatRuntimeEnvironment } from 'hardhat/types';
22
import { DeployFunction } from 'hardhat-deploy/types';
3-
import { ghoEntityConfig } from '../src/helpers/config';
4-
import { getGhoToken } from '../src/helpers/contract-getters';
3+
import { ghoEntityConfig } from '../helpers/config';
4+
import { getGhoToken } from '../helpers/contract-getters';
55
import { TREASURY_PROXY_ID, getPoolAddressesProvider, getTreasuryAddress } from '@aave/deploy-v3';
66

77
const func: DeployFunction = async function ({

deploy/09_deploy_uighodataprovider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { HardhatRuntimeEnvironment } from 'hardhat/types';
22
import { DeployFunction } from 'hardhat-deploy/types';
3-
import { getGhoToken } from '../src/helpers/contract-getters';
3+
import { getGhoToken } from '../helpers/contract-getters';
44
import { getPoolAddressesProvider } from '@aave/deploy-v3';
55

66
const func: DeployFunction = async function ({

foundry.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[profile.default]
22
src = 'src/contracts'
33
out = 'out'
4-
test = 'src/contracts/test'
4+
test = 'src/test'
55
cache_path = 'forge-cache'
66
libs = ["node_modules", "lib"]
77
remappings = [

hardhat.config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
getCommonNetworkConfig,
33
getRemappings,
44
hardhatNetworkSettings,
5-
} from './src/helpers/hardhat-config';
5+
} from './helpers/hardhat-config';
66
import { config } from 'dotenv';
77
import { HardhatUserConfig } from 'hardhat/types';
88
import { TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS } from 'hardhat/builtin-tasks/task-names';
@@ -17,7 +17,7 @@ import 'hardhat-preprocessor';
1717

1818
config();
1919

20-
import { loadHardhatTasks } from './src/helpers/misc-utils';
20+
import { loadHardhatTasks } from './helpers/misc-utils';
2121
import '@aave/deploy-v3';
2222

2323
// Prevent to load tasks before compilation and typechain
@@ -71,8 +71,8 @@ const hardhatConfig: HardhatUserConfig = {
7171
],
7272
},
7373
paths: {
74-
sources: './src/contracts',
75-
tests: './src/test/',
74+
sources: './src/',
75+
tests: './test/',
7676
cache: './cache',
7777
artifacts: './artifacts',
7878
},
File renamed without changes.

0 commit comments

Comments
 (0)