Skip to content

Commit b2a7c9c

Browse files
committed
refactor: update occurences
1 parent f11adcd commit b2a7c9c

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

.solcover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports = {
2121
'tools/testing/ERC1271Mock.sol',
2222
'tools/testing/TestClient.sol',
2323
'tools/testing/TestReceiver.sol',
24-
'modules/facets/SignatureVerifier.sol',
24+
'facets/SignatureVerifier.sol',
2525
],
2626
istanbulFolder: BASE_FOLDER,
2727
};

deploy/0_deploy.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ export default async function deploy() {
7676
);
7777
const diamond = DiamondCutFacet__factory.connect(diamondProxyAddress, owner);
7878
console.log(`IexecInstance found at address: ${await diamond.getAddress()}`);
79-
// Deploy library & modules
79+
// Deploy library & facets
8080
const iexecLibOrdersAddress = await factoryDeployer.deployContract(
8181
new IexecLibOrders_v5__factory(),
8282
);
8383
const iexecLibOrders = {
8484
['contracts/libs/IexecLibOrders_v5.sol:IexecLibOrders_v5']: iexecLibOrdersAddress,
8585
};
86-
const modules = [
86+
const facets = [
8787
new IexecAccessorsFacet__factory(),
8888
new IexecAccessorsABILegacyFacet__factory(),
8989
new IexecCategoryManagerFacet__factory(),
@@ -99,17 +99,17 @@ export default async function deploy() {
9999
new IexecPocoBoostFacet__factory(iexecLibOrders),
100100
new IexecPocoBoostAccessorsFacet__factory(),
101101
];
102-
for (const module of modules) {
103-
const address = await factoryDeployer.deployContract(module);
104-
await linkContractToProxy(diamond, address, module);
102+
for (const facet of facets) {
103+
const address = await factoryDeployer.deployContract(facet);
104+
await linkContractToProxy(diamond, address, facet);
105105
}
106106
// Verify linking on Diamond Proxy
107107
const diamondLoupeFacetInstance: DiamondLoupeFacet = DiamondLoupeFacet__factory.connect(
108108
diamondProxyAddress,
109109
owner,
110110
);
111-
const facets = await diamondLoupeFacetInstance.facets();
112-
const functionCount = facets
111+
const diamondFacets = await diamondLoupeFacetInstance.facets();
112+
const functionCount = diamondFacets
113113
.map((facet) => facet.functionSelectors.length)
114114
.reduce((acc, curr) => acc + curr, 0);
115115
console.log(`The deployed Diamond Proxy now supports ${functionCount} functions:`);

hardhat.config.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -272,17 +272,13 @@ const config: HardhatUserConfig = {
272272
templates: 'docs/solidity/templates',
273273
exclude: [
274274
'external',
275-
'modules/facets/IexecAccessorsABILegacyFacet.sol', // not relevant
276-
'modules/facets/IexecEscrowTokenSwapFacet.sol', // not relevant
277-
'modules/facets/SignatureVerifier.sol', // contains only internal/private
278-
'modules/facets/SignatureVerifier.v8.sol',
279-
'modules/interfaces', // interesting for events but too much doc duplication if enabled
275+
'facets/IexecAccessorsABILegacyFacet.sol', // not relevant
276+
'facets/IexecEscrowTokenSwapFacet.sol', // not relevant
277+
'facets/SignatureVerifier.sol', // contains only internal/private
278+
'facets/SignatureVerifier.v8.sol',
279+
'interfaces', // interesting for events but too much doc duplication if enabled
280280
'registries', // ignore them for now
281281
'tools',
282-
'IexecInterfaceNativeABILegacy.sol', // ignore interfaces
283-
'IexecInterfaceTokenABILegacy.sol',
284-
'IexecInterfaceNative.sol',
285-
'IexecInterfaceToken.sol',
286282
'Store.sol', // almost empty
287283
'Store.v8.sol',
288284
],

0 commit comments

Comments
 (0)