Skip to content

Commit

Permalink
rollback prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
novaknole committed Apr 26, 2024
1 parent 409901f commit 70d2051
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 19 deletions.
16 changes: 8 additions & 8 deletions src/DeploymentFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ export class DeploymentFactory {
throw Error('unsigned tx data as bytes not supported');
return getAddress(
'0x' +
solidityKeccak256(
['bytes'],
[
`0xff${create2DeployerAddress.slice(2)}${salt.slice(
2
)}${solidityKeccak256(['bytes'], [deploymentTx.data]).slice(2)}`,
]
).slice(-40)
solidityKeccak256(
['bytes'],
[
`0xff${create2DeployerAddress.slice(2)}${salt.slice(
2
)}${solidityKeccak256(['bytes'], [deploymentTx.data]).slice(2)}`,
]
).slice(-40)
);
}

Expand Down
15 changes: 4 additions & 11 deletions src/DeploymentsManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1048,11 +1048,7 @@ export class DeploymentsManager {
if (externalContracts.deploy) {
this.db.onlyArtifacts = externalContracts.artifacts;
try {
await this.executeDeployScripts(
[externalContracts.deploy],
tags,
options.tagsRequireAll
);
await this.executeDeployScripts([externalContracts.deploy], tags, options.tagsRequireAll);
} finally {
this.db.onlyArtifacts = undefined;
}
Expand All @@ -1072,7 +1068,7 @@ export class DeploymentsManager {
public async executeDeployScripts(
deployScriptsPaths: string[],
tags: string[] = [],
tagsRequireAll = false
tagsRequireAll = false,
): Promise<void> {
const wasWrittingToFiles = this.db.writeDeploymentsToFiles;
// TODO loop over companion networks ?
Expand Down Expand Up @@ -1132,11 +1128,8 @@ export class DeploymentsManager {
bag.push(scriptFilePath);
}
// console.log("tags found " + scriptFilePath, scriptTags);
if (
(tagsRequireAll && tags.every((tag) => scriptTags.includes(tag))) ||
(!tagsRequireAll &&
(tags.length == 0 || tags.some((tag) => scriptTags.includes(tag))))
) {
if (tagsRequireAll && tags.every(tag => scriptTags.includes(tag))
|| !tagsRequireAll && (tags.length == 0 || tags.some(tag => scriptTags.includes(tag)))) {
scriptFilePaths.push(scriptFilePath);
}
}
Expand Down

0 comments on commit 70d2051

Please sign in to comment.