diff --git a/packages/cli/package/src/lib/chain/chainValidators.ts b/packages/cli/package/src/lib/chain/chainValidators.ts index e1311366a..46855516e 100644 --- a/packages/cli/package/src/lib/chain/chainValidators.ts +++ b/packages/cli/package/src/lib/chain/chainValidators.ts @@ -93,31 +93,3 @@ export async function getProtocolVersions() { return protocolVersions; } - -export async function validateProtocolVersion( - protocolVersion: number, -): Promise { - const { minProtocolVersion, maxProtocolVersion } = - await getProtocolVersions(); - - if ( - protocolVersion < minProtocolVersion || - protocolVersion > maxProtocolVersion - ) { - const minProtocolVersionStr = bigintToStr(minProtocolVersion); - - if (minProtocolVersion === maxProtocolVersion) { - return `Protocol version must be equal to ${color.yellow( - minProtocolVersionStr, - )}. Got: ${color.yellow(protocolVersion)}`; - } - - return `Protocol version must be ${color.yellow( - `>=${minProtocolVersionStr}`, - )} and ${color.yellow(`<=${minProtocolVersionStr}`)}. Got: ${color.yellow( - protocolVersion, - )}`; - } - - return true; -} diff --git a/packages/cli/package/src/lib/configs/project/provider/provider3.ts b/packages/cli/package/src/lib/configs/project/provider/provider3.ts index 723ff5907..c102746ee 100644 --- a/packages/cli/package/src/lib/configs/project/provider/provider3.ts +++ b/packages/cli/package/src/lib/configs/project/provider/provider3.ts @@ -20,11 +20,9 @@ import type { JSONSchemaType } from "ajv"; import isEmpty from "lodash-es/isEmpty.js"; import mapValues from "lodash-es/mapValues.js"; -import { versions } from "../../../../versions.js"; import { ccDurationValidator, validateAddress, - validateProtocolVersion, } from "../../../chain/chainValidators.js"; import { PROVIDER_CONFIG_FULL_FILE_NAME, @@ -172,66 +170,10 @@ export default { validateCC(config), validateMissingComputePeers(config), validateNoDuplicateNoxNamesInOffers(config), - validateProtocolVersions(config), ); }, } satisfies ConfigOptions; -async function validateProtocolVersions(providerConfig: Config) { - const errors = ( - await Promise.all( - Object.entries(providerConfig.offers).flatMap( - ([ - offer, - { - maxProtocolVersion = versions.protocolVersion, - minProtocolVersion = versions.protocolVersion, - }, - ]) => { - return [ - Promise.resolve({ - offer, - property: "minProtocolVersion or maxProtocolVersion", - validity: - minProtocolVersion > maxProtocolVersion - ? `minProtocolVersion must be less than or equal to maxProtocolVersion. Got: minProtocolVersion=${color.yellow( - minProtocolVersion, - )} maxProtocolVersion=${color.yellow(maxProtocolVersion)}` - : true, - }), - ...( - [ - ["minProtocolVersion", minProtocolVersion], - ["maxProtocolVersion", maxProtocolVersion], - ] as const - ).map(async ([property, v]) => { - return { - offer, - property, - validity: await validateProtocolVersion(v), - }; - }), - ]; - }, - ), - ) - ).filter((a): a is typeof a & { validity: string } => { - return a.validity !== true; - }); - - if (errors.length > 0) { - return errors - .map(({ offer, property, validity }) => { - return `Offer ${color.yellow(offer)} has invalid ${color.yellow( - property, - )} property: ${validity}`; - }) - .join("\n"); - } - - return true; -} - function validateNoDuplicateNoxNamesInOffers(config: Config): ValidationResult { const noxNamesInOffers: Record = {};