Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support returning multiple validation errors (PR 1) #476

Merged
merged 6 commits into from
Oct 2, 2023
Merged

Support returning multiple validation errors (PR 1) #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9483774
refactor stage two validation to return all validation errors
zoeyTM Sep 18, 2023
85b0790
refactor tests to match validation changes
zoeyTM Sep 18, 2023
a016715
merge stageOne validation into stageTwo and update stageOne logic for…
zoeyTM Sep 25, 2023
2b31a92
rename stageTwo folder to futures
zoeyTM Sep 25, 2023
3a5ce6b
update tests
zoeyTM Sep 25, 2023
ea3e1cd
Merge branch 'development' into multiple-validation-messages
zoeyTM Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/core/src/deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { BasicExecutionStrategy } from "./internal/execution/basic-execution-str
import { EIP1193JsonRpcClient } from "./internal/execution/jsonrpc-client";
import { getDefaultSender } from "./internal/execution/utils/get-default-sender";
import { checkAutominedNetwork } from "./internal/utils/check-automined-network";
import { validateStageOne } from "./internal/validation/validateStageOne";
import { validate } from "./internal/validation/validate";
import { ArtifactResolver } from "./types/artifact";
import {
DeployConfig,
Expand Down Expand Up @@ -66,9 +66,11 @@ export async function deploy<
});
}

const validationResult = await validateStageOne(
const validationResult = await validate(
ignitionModule,
artifactResolver
artifactResolver,
deploymentParameters,
accounts
);

if (validationResult !== null) {
Expand Down
14 changes: 0 additions & 14 deletions packages/core/src/internal/deployer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import { formatExecutionError } from "./formatters";
import { Reconciler } from "./reconciliation/reconciler";
import { assertIgnitionInvariant } from "./utils/assertions";
import { getFuturesFromModule } from "./utils/get-futures-from-module";
import { validateStageTwo } from "./validation/validateStageTwo";

/**
* Run an Igntition deployment.
Expand Down Expand Up @@ -78,19 +77,6 @@ export class Deployer {
accounts: string[],
defaultSender: string
): Promise<DeploymentResult<ContractNameT, IgnitionModuleResultsT>> {
const validationResult = await validateStageTwo(
ignitionModule,
this._artifactResolver,
deploymentParameters,
accounts
);

if (validationResult !== null) {
this._emitDeploymentCompleteEvent(validationResult);

return validationResult;
}

let deploymentState = await this._getOrInitializeDeploymentState(
ignitionModule.id
);
Expand Down
Loading
Loading