feat: first iteration at coretime impl

Author: filvecchiato

src/chains-config/kusamaControllers.ts

@@ -54,7 +54,6 @@ export const kusamaControllers: ControllerConfig = {
 		'TransactionMaterial',
 		'TransactionSubmit',
 		'CoretimeGeneric',
-		'CoretimeRelay',
 	],
 	options: {
 		finalizes: true,

src/chains-config/polkadotControllers.ts

@@ -54,7 +54,6 @@ export const polkadotControllers: ControllerConfig = {
 		'TransactionMaterial',
 		'TransactionSubmit',
 		'CoretimeGeneric',
-		'CoretimeRelay',
 	],
 	options: {
 		finalizes: true,

src/chains-config/westendControllers.ts

@@ -53,7 +53,6 @@ export const westendControllers: ControllerConfig = {
 		'TransactionMaterial',
 		'TransactionSubmit',
 		'CoretimeGeneric',
-		'CoretimeRelay',
 	],
 	options: {
 		finalizes: true,

src/controllers/coretime/CoretimeChainController.ts

@@ -28,40 +28,22 @@ export default class CoretimeChainController extends AbstractController<Coretime
 	// TODO: check if its either coretime or relay chain, if neither error out
 	protected initRoutes(): void {
 		this.safeMountAsyncGetHandlers([
-			['/sale', this.getCoretimeSaleInfo],
-			['/bulk', this.getBulk],
-			['/leases', this.getLeases],
+			['/leases', this.getLeases], // :taskId
 			['/regions', this.getRegions],
-			['/cores', this.getWorkload],
+			['/renewals', this.getRenewals],
+			['/reservations', this.getReservations],
 		]);
 	}
-	/*
-        relay => => use coretimeAssignmentProvider || onDemandAssignmentProvider
-        coretime => bulk time info => use broker
-
-		from relay chains: 
-			-
-    */
 
 	private checkCoretimeModule = (): void => {
 		if (this.api.query.onDemandAssignmentProvider && this.api.query.coretimeAssignmentProvider) {
 			return;
 		} else if (this.api.query.broker) {
 			return;
 		}
-		console.log(this.api.consts);
 		throw new Error('One or more coretime modules are not available on this network.');
 	};
 
-	// get overview on coretime
-	private getBulk: RequestHandler = async ({ query: { at } }, res): Promise<void> => {
-		this.checkCoretimeModule();
-
-		const hash = await this.getHashFromAt(at);
-
-		CoretimeChainController.sanitizedSend(res, await this.service.getBulkInfo(hash));
-	};
-
 	private getLeases: RequestHandler = async ({ query: { at } }, res): Promise<void> => {
 		this.checkCoretimeModule();
 
@@ -70,27 +52,27 @@ export default class CoretimeChainController extends AbstractController<Coretime
 		CoretimeChainController.sanitizedSend(res, await this.service.getCoretimeLeases(hash));
 	};
 
-	private getCoretimeSaleInfo: RequestHandler = async ({ query: { at } }, res): Promise<void> => {
+	private getRegions: RequestHandler = async ({ query: { at } }, res): Promise<void> => {
 		this.checkCoretimeModule();
 
 		const hash = await this.getHashFromAt(at);
 
-		CoretimeChainController.sanitizedSend(res, await this.service.getCoretimeSaleInfo(hash));
+		CoretimeChainController.sanitizedSend(res, await this.service.getCoretimeRegions(hash));
 	};
 
-	private getRegions: RequestHandler = async ({ query: { at } }, res): Promise<void> => {
+	private getReservations: RequestHandler = async ({ query: { at } }, res): Promise<void> => {
 		this.checkCoretimeModule();
 
 		const hash = await this.getHashFromAt(at);
 
-		CoretimeChainController.sanitizedSend(res, await this.service.getCoretimeRegions(hash));
+		CoretimeChainController.sanitizedSend(res, await this.service.getCoretimeReservations(hash));
 	};
 
-	private getWorkload: RequestHandler = async ({ query: { at } }, res): Promise<void> => {
+	private getRenewals: RequestHandler = async ({ query: { at } }, res): Promise<void> => {
 		this.checkCoretimeModule();
 
 		const hash = await this.getHashFromAt(at);
 
-		CoretimeChainController.sanitizedSend(res, await this.service.getCoretimeCores(hash));
+		CoretimeChainController.sanitizedSend(res, await this.service.getCoretimeRenewals(hash));
 	};
 }

src/controllers/coretime/CoretimeGenericController.ts

@@ -28,26 +28,11 @@ export default class CoretimeGenericController extends AbstractController<Coreti
 	// TODO: check if its either coretime or relay chain, if neither error out
 	protected initRoutes(): void {
 		this.safeMountAsyncGetHandlers([
-			// sale info
-			//  configuration
-			// status
 			['/info', this.getCoretimeOverview],
-			// bulk leases
-			// leases and regions?
-			// ['/workload', this.getParachains],
-			// ondemand status
-			// ['/workplan', this.getParachains],
+			['/cores', this.getCoretimeCores],
 		]);
 	}
-	/*
-        relay => => use coretimeAssignmentProvider || onDemandAssignmentProvider
-        coretime => bulk time info => use broker
 
-		from relay chains: 
-			-
-    */
-
-	// get overview on coretime
 	private getCoretimeOverview: RequestHandler = async ({ query: { at } }, res): Promise<void> => {
 		this.checkCoretimeModule();
 
@@ -56,13 +41,22 @@ export default class CoretimeGenericController extends AbstractController<Coreti
 		CoretimeGenericController.sanitizedSend(res, await this.service.getCoretimeInfo(hash));
 	};
 
+	private getCoretimeCores: RequestHandler = async ({ query: { at, core } }, res): Promise<void> => {
+		this.checkCoretimeModule();
+
+		const hash = await this.getHashFromAt(at);
+
+		const coreId = core ? (core as unknown as string) : undefined;
+
+		CoretimeGenericController.sanitizedSend(res, await this.service.getCoretimeCores(hash, coreId));
+	};
+
 	private checkCoretimeModule = (): void => {
 		if (this.api.query.onDemandAssignmentProvider && this.api.query.coretimeAssignmentProvider) {
 			return;
 		} else if (this.api.query.broker) {
 			return;
 		}
-		console.log(this.api.consts);
 		throw new Error('One or more coretime modules are not available on this network.');
 	};
 }

src/controllers/coretime/CoretimeRelayController.ts

@@ -16,4 +16,3 @@
 
 export { default as CoretimeChain } from './CoretimeChainController';
 export { default as CoretimeGeneric } from './CoretimeGenericController';
-export { default as CoretimeRelay } from './CoretimeRelayController';

src/controllers/coretime/index.ts

@@ -27,7 +27,7 @@ import {
 } from './accounts';
 import { Blocks, BlocksExtrinsics, BlocksRawExtrinsics, BlocksTrace } from './blocks';
 import { ContractsInk } from './contracts';
-import { CoretimeChain, CoretimeGeneric, CoretimeRelay } from './coretime';
+import { CoretimeChain, CoretimeGeneric } from './coretime';
 import { NodeNetwork, NodeTransactionPool, NodeVersion } from './node';
 import {
 	PalletsAssetConversion,
@@ -92,5 +92,4 @@ export const controllers = {
 	Paras,
 	CoretimeGeneric,
 	CoretimeChain,
-	CoretimeRelay,
 };