From 5773b2d19aec9663dc4caf959d969180c0c638a2 Mon Sep 17 00:00:00 2001 From: Sanket Teli Date: Thu, 1 Aug 2024 13:16:45 +0530 Subject: [PATCH] dropped the interface for version 1 capabilities Signed-off-by: Sanket Teli --- src/extend-config/extendGlobal.ts | 6 ++---- src/types/FabloConfigExtended.ts | 9 +-------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/extend-config/extendGlobal.ts b/src/extend-config/extendGlobal.ts index 75cab6fa..a81e870a 100644 --- a/src/extend-config/extendGlobal.ts +++ b/src/extend-config/extendGlobal.ts @@ -5,13 +5,11 @@ import { GlobalJson } from "../types/FabloConfigJson"; import defaults from "./defaults"; const getNetworkCapabilities = (fabricVersion: string): Capabilities => { - if (version(fabricVersion).isGreaterOrEqual("2.0.0")) - return { channel: "V2_0", orderer: "V2_0", application: "V2_0", isV2: true }; - + if (version(fabricVersion).isGreaterOrEqual("2.5.0")) return { channel: "V2_5", orderer: "V2_5", application: "V2_5", isV2: true }; - return { channel: "V1_3", orderer: "V1_1", application: "V1_3", isV2: false }; + return { channel: "V2_0", orderer: "V2_0", application: "V2_0", isV2: true }; }; const getVersions = (fabricVersion: string): FabricVersions => { diff --git a/src/types/FabloConfigExtended.ts b/src/types/FabloConfigExtended.ts index 6473fc70..ade5af33 100644 --- a/src/types/FabloConfigExtended.ts +++ b/src/types/FabloConfigExtended.ts @@ -8,13 +8,6 @@ export interface FabricVersions { fabricRecommendedNodeVersion: string; } -interface CapabilitiesV1 { - application: "V1_3" | "V1_4_2"; - channel: "V1_3" | "V1_4_2" | "V1_4_3"; - orderer: "V1_1" | "V1_4_2"; - isV2: false; -} - interface CapabilitiesV2 { application: "V2_0"; channel: "V2_0"; @@ -32,7 +25,7 @@ interface CapabilitiesV_2_5 { -export type Capabilities = CapabilitiesV1 | CapabilitiesV2 | CapabilitiesV_2_5; +export type Capabilities = CapabilitiesV2 | CapabilitiesV_2_5; export interface Global extends FabricVersions { tls: boolean;