From c1fe6a0e0b6b84442adf2641393b8f744e76ab34 Mon Sep 17 00:00:00 2001 From: Takuma TAKEUCHI Date: Mon, 4 Oct 2021 21:59:23 +0900 Subject: [PATCH] feat(cmd-server-socket): add a communication test to open-api validators Signed-off-by: Takuma TAKEUCHI --- .../BusinessLogicRunTransaction.ts | 238 ++++++++++-------- examples/test-run-transaction/RequestInfo.ts | 29 ++- .../test-run-transaction/config/BLP_config.ts | 26 +- .../test-run-transaction/config/default.yaml | 5 + .../config/usersetting.json | 2 +- .../config/usersetting.yaml | 15 ++ .../test-run-transaction/copyBLPConfig.ts | 7 +- .../test-run-transaction/copyStaticAssets.ts | 6 +- examples/test-run-transaction/package.json | 12 +- .../replaceBLPConfigPath.ts | 14 +- .../supply-chain-app-stub/app/app.ts | 32 +-- .../app/routes/supply-chain-app.ts | 32 ++- .../test-run-transaction.ts | 22 +- examples/test-run-transaction/tsconfig.json | 2 +- 14 files changed, 246 insertions(+), 196 deletions(-) create mode 100644 examples/test-run-transaction/config/default.yaml create mode 100644 examples/test-run-transaction/config/usersetting.yaml diff --git a/examples/test-run-transaction/BusinessLogicRunTransaction.ts b/examples/test-run-transaction/BusinessLogicRunTransaction.ts index c397b60923..3ec7ed5ab0 100644 --- a/examples/test-run-transaction/BusinessLogicRunTransaction.ts +++ b/examples/test-run-transaction/BusinessLogicRunTransaction.ts @@ -5,123 +5,143 @@ * BusinessLogicRunTransaction.ts */ -import { Request } from 'express'; -import { RequestInfo } from './RequestInfo'; +import { Request } from "express"; +import { RequestInfo } from "./RequestInfo"; //import { MeterManagement } from './MeterManagement'; //import { MeterInfo } from './MeterInfo'; -import { TradeInfo } from '../../packages/routing-interface/TradeInfo'; -import { transactionManagement } from '../../packages/routing-interface/routes/index'; -import { verifierFactory } from '../../packages/routing-interface/routes/index'; -import { BusinessLogicBase } from '../../packages/business-logic-plugin/BusinessLogicBase'; +import { TradeInfo } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/TradeInfo"; +import { transactionManagement } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/routes/index"; +import { verifierFactory } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/routes/index"; +import { BusinessLogicBase } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/business-logic-plugin/BusinessLogicBase"; //import { makeRawTransaction } from './TransactionEthereum' -import { LedgerEvent } from '../../packages/ledger-plugin/LedgerPlugin'; -import { json2str } from '../../packages/ledger-plugin/DriverCommon' - -const fs = require('fs'); -const path = require('path'); -const config: any = JSON.parse(fs.readFileSync(path.resolve(__dirname, "./config/default.json"), 'utf8')); +import { LedgerEvent } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/verifier/LedgerPlugin"; +import { json2str } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/verifier/DriverCommon"; + +const fs = require("fs"); +const path = require("path"); +const yaml = require("js-yaml"); +//const config: any = JSON.parse(fs.readFileSync("/etc/cactus/default.json", 'utf8')); +const config: any = yaml.safeLoad( + fs.readFileSync("/etc/cactus/default.yaml", "utf8") +); import { getLogger } from "log4js"; -const moduleName = 'BusinessLogicRunTransaction'; +const moduleName = "BusinessLogicRunTransaction"; const logger = getLogger(`${moduleName}`); logger.level = config.logLevel; export class BusinessLogicRunTransaction extends BusinessLogicBase { - businessLogicID: string; - - constructor(businessLogicID: string) { - super(); - this.businessLogicID = businessLogicID; - } - - startTransaction(req: Request, businessLogicID: string, tradeID: string) { - - logger.debug("called startTransaction()"); - - // set RequestInfo - const requestInfo: RequestInfo = new RequestInfo(); - requestInfo.setBusinessLogicID(businessLogicID); - requestInfo.keychainId = req.body.tradeParams[0]; - requestInfo.keychainRef = req.body.tradeParams[1]; - requestInfo.channelName = req.body.tradeParams[2]; - requestInfo.invocationType = req.body.tradeParams[3]; - requestInfo.functionName = req.body.tradeParams[4]; - requestInfo.functionArgs = req.body.tradeParams[5]; - logger.debug(`tradeParams: ${req.body.tradeParams}`); - - // set TradeID - requestInfo.setTradeID(tradeID); - - // Create trade information - const tradeInfo: TradeInfo = new TradeInfo(requestInfo.businessLogicID, requestInfo.tradeID); - - // Call Verifier to perform the function - this.execTransaction(requestInfo, tradeInfo); - - } - - - execTransaction(requestInfo: RequestInfo, tradeInfo: TradeInfo) { - - logger.debug("called execTransaction()"); - - const useValidator = JSON.parse(transactionManagement.getValidatorToUse(tradeInfo.businessLogicID)); - - // TODO: Temporarily specify no monitoring required (# 3rd parameter = false) - const verifier = verifierFactory.getVerifier(useValidator['validatorID'][0], {}, false); - logger.debug("getVerifier"); - - // TODO: for Temporarily specify no monitoring required (# 3rd parameter = false) - verifier.setEventListener(transactionManagement); - - const contract = {}; - const method = {command: "test-run-transaction"}; - const args = {"args": { - "keychainId": requestInfo.keychainId, - "keychainRef": requestInfo.keychainRef, - "channelName": requestInfo.channelName, - "invocationType": requestInfo.invocationType, - "functionName": requestInfo.functionName, - "functionArgs": requestInfo.functionArgs - }}; - - logger.debug(`##before call verifier.requestLedgerOperationHttp()`); - verifier.requestLedgerOperationHttp(contract, method, args); - logger.debug(`##after call verifier.requestLedgerOperationHttp()`); - - } - - - onEvent(ledgerEvent: LedgerEvent, targetIndex: number): void { - logger.debug(`##in BLP:onEvent()`); - logger.debug(`##onEvent(): ${json2str(ledgerEvent)}`); + businessLogicID: string; + + constructor(businessLogicID: string) { + super(); + this.businessLogicID = businessLogicID; + } + + startTransaction(req: Request, businessLogicID: string, tradeID: string) { + logger.debug("called startTransaction()"); + + // set RequestInfo + const requestInfo: RequestInfo = new RequestInfo(); + requestInfo.setBusinessLogicID(businessLogicID); + requestInfo.keychainId = req.body.tradeParams[0]; + requestInfo.keychainRef = req.body.tradeParams[1]; + requestInfo.channelName = req.body.tradeParams[2]; + requestInfo.invocationType = req.body.tradeParams[3]; + requestInfo.functionName = req.body.tradeParams[4]; + requestInfo.functionArgs = req.body.tradeParams[5]; + logger.debug(`tradeParams: ${req.body.tradeParams}`); + + // set TradeID + requestInfo.setTradeID(tradeID); + + // Create trade information + const tradeInfo: TradeInfo = new TradeInfo( + requestInfo.businessLogicID, + requestInfo.tradeID + ); + + // Call Verifier to perform the function + this.execTransaction(requestInfo, tradeInfo); + } + + execTransaction(requestInfo: RequestInfo, tradeInfo: TradeInfo) { + logger.debug("called execTransaction()"); + + const useValidator = JSON.parse( + transactionManagement.getValidatorToUse(tradeInfo.businessLogicID) + ); + + // TODO: Temporarily specify no monitoring required (# 4rd parameter = false) + const verifier = verifierFactory.getVerifier( + useValidator["validatorID"][0], + "BusinessLogicRunTransaction", + {}, + false + ); + logger.debug("getVerifier"); + + const contract = {}; + const method = { command: "test-run-transaction" }; + const args = { + args: { + keychainId: requestInfo.keychainId, + keychainRef: requestInfo.keychainRef, + channelName: requestInfo.channelName, + invocationType: requestInfo.invocationType, + functionName: requestInfo.functionName, + functionArgs: requestInfo.functionArgs, + }, + }; + + logger.debug(`##execTransaction call verifier.sendAsyncRequest()`); + verifier + .sendAsyncRequest(contract, method, args) + .then(() => { + logger.debug(`##execTransaction sendAsyncRequest finish`); + }) + .catch((err) => { + logger.error(err); + }); + } + + onEvent(ledgerEvent: LedgerEvent, targetIndex: number): void { + logger.debug(`##in BLP:onEvent()`); + logger.debug(`##onEvent(): ${json2str(ledgerEvent)}`); + } + + getEventDataNum(ledgerEvent: LedgerEvent): number { + // NOTE: This method implements the BisinessLogcPlugin operation(* Override by subclass) + // TODO: + logger.debug( + `##in getEventDataNum(), ledgerEvent: ${JSON.stringify(ledgerEvent)}` + ); + const retEventNum = ledgerEvent.data["blockData"].length; + logger.debug(`##retEventNum: ${retEventNum}`); + return retEventNum; + } + + getTxIDFromEvent( + ledgerEvent: LedgerEvent, + targetIndex: number + ): string | null { + // NOTE: This method implements the BisinessLogcPlugin operation(* Override by subclass) + // TODO: + logger.debug( + `##in getTxIDFromEvent(), ledgerEvent: ${JSON.stringify(ledgerEvent)}` + ); + + const txId = ledgerEvent.data["txId"]; + + if (typeof txId !== "string") { + logger.warn( + `#getTxIDFromEvent(): skip(invalid block, not found txId.), event: ${json2str( + ledgerEvent + )}` + ); + return null; } - - getEventDataNum(ledgerEvent: LedgerEvent): number { - // NOTE: This method implements the BisinessLogcPlugin operation(* Override by subclass) - // TODO: - logger.debug(`##in getEventDataNum(), ledgerEvent: ${JSON.stringify(ledgerEvent)}`); - const retEventNum = ledgerEvent.data['blockData'].length; - logger.debug(`##retEventNum: ${retEventNum}`); - return retEventNum; - } - - - getTxIDFromEvent(ledgerEvent: LedgerEvent, targetIndex: number): string | null { - // NOTE: This method implements the BisinessLogcPlugin operation(* Override by subclass) - // TODO: - logger.debug(`##in getTxIDFromEvent(), ledgerEvent: ${JSON.stringify(ledgerEvent)}`); - - const txId = ledgerEvent.data['txId']; - - if (typeof txId !== 'string') { - logger.warn(`#getTxIDFromEvent(): skip(invalid block, not found txId.), event: ${json2str(ledgerEvent)}`); - return null; - } - - logger.debug(`###getTxIDFromEvent(): txId: ${txId}`); - return txId; - } - - + logger.debug(`###getTxIDFromEvent(): txId: ${txId}`); + return txId; + } } diff --git a/examples/test-run-transaction/RequestInfo.ts b/examples/test-run-transaction/RequestInfo.ts index 8c9a1939f6..6834723311 100644 --- a/examples/test-run-transaction/RequestInfo.ts +++ b/examples/test-run-transaction/RequestInfo.ts @@ -7,22 +7,21 @@ // request information export class RequestInfo { - businessLogicID: string; - tradeID: string; + businessLogicID: string; + tradeID: string; - keychainId: string; - keychainRef: string; - channelName: string; - invocationType: string; - functionName: string; - functionArgs: Array; + keychainId: string; + keychainRef: string; + channelName: string; + invocationType: string; + functionName: string; + functionArgs: Array; - setBusinessLogicID(businessLogicID: string) { - this.businessLogicID = businessLogicID; - } + setBusinessLogicID(businessLogicID: string) { + this.businessLogicID = businessLogicID; + } - setTradeID(tradeID: string) { - this.tradeID = tradeID; - } + setTradeID(tradeID: string) { + this.tradeID = tradeID; + } } - diff --git a/examples/test-run-transaction/config/BLP_config.ts b/examples/test-run-transaction/config/BLP_config.ts index 650be3b5d2..399231932f 100644 --- a/examples/test-run-transaction/config/BLP_config.ts +++ b/examples/test-run-transaction/config/BLP_config.ts @@ -5,17 +5,19 @@ * BLP_config.ts */ -import { BusinessLogicPlugin } from '../../../packages/business-logic-plugin/BusinessLogicPlugin'; -import { BusinessLogicRunTransaction } from '../BusinessLogicRunTransaction'; -// import { BusinessLogicCartrade } from '../examples/cartrade/BusinessLogicXxxxTrade'; +import { BusinessLogicPlugin } from "../../../packages/cactus-cmd-socketio-server/src/main/typescript/business-logic-plugin/BusinessLogicPlugin"; +import { BusinessLogicRunTransaction } from "../BusinessLogicRunTransaction"; +// import { BusinessLogicCartrade } from '../examples/cartrade/BusinessLogic***Trade'; -export function getTargetBLPInstance(businessLogicID: string): BusinessLogicPlugin | null { - switch (businessLogicID) { - case "j71S9gLN": - return new BusinessLogicRunTransaction(businessLogicID); - // case "xxxxxxxx": - // return new BusinessLogicXxxxTrade(); - default: - return null; - } +export function getTargetBLPInstance( + businessLogicID: string +): BusinessLogicPlugin | null { + switch (businessLogicID) { + case "j71S9gLN": + return new BusinessLogicRunTransaction(businessLogicID); + // case "*******": + // return new BusinessLogicX***Trade(); + default: + return null; + } } diff --git a/examples/test-run-transaction/config/default.yaml b/examples/test-run-transaction/config/default.yaml new file mode 100644 index 0000000000..29eb9008c2 --- /dev/null +++ b/examples/test-run-transaction/config/default.yaml @@ -0,0 +1,5 @@ +runTransactionInfo: + connector: + validatorID: vIdO32CF + +logLevel: debug diff --git a/examples/test-run-transaction/config/usersetting.json b/examples/test-run-transaction/config/usersetting.json index 180247c94e..721ce96e2f 100644 --- a/examples/test-run-transaction/config/usersetting.json +++ b/examples/test-run-transaction/config/usersetting.json @@ -7,7 +7,7 @@ ], "logLevel": "debug", "applicationHostInfo": { - "hostName": "http://xxx.xxxxx.xxx:xxxx", + "hostName": "http://aaa.bbb.ccc.ddd", "hostPort": 5034 }, "appRouters": [ diff --git a/examples/test-run-transaction/config/usersetting.yaml b/examples/test-run-transaction/config/usersetting.yaml new file mode 100644 index 0000000000..32e3ce3b84 --- /dev/null +++ b/examples/test-run-transaction/config/usersetting.yaml @@ -0,0 +1,15 @@ +blpRegistry: + - + businessLogicID: j71S9gLN + validatorID: [vIdO32CF] + +logLevel: debug + +applicationHostInfo: + hostName: http://aaa.bbb.ccc.ddd + hostPort: 5034 + +appRouters: + - + path: /api/v1/bl/test-run-transaction/ + routerJs: ../../../../../../examples/test-run-transaction/test-run-transaction.js \ No newline at end of file diff --git a/examples/test-run-transaction/copyBLPConfig.ts b/examples/test-run-transaction/copyBLPConfig.ts index 48aa294c8a..6a4e170641 100644 --- a/examples/test-run-transaction/copyBLPConfig.ts +++ b/examples/test-run-transaction/copyBLPConfig.ts @@ -5,9 +5,12 @@ * copyBLPConfig.ts */ -import * as shell from 'shelljs'; +import * as shell from "shelljs"; // NOTE: Copy the static assets to the dist folder. // Example: // shell.cp('-R', 'src/routing-interface/views', 'dist/routing-interface/views/'); -shell.cp('../../dist/examples/test-run-transaction/config/BLP_config.js', '../../dist/packages/config/'); +shell.cp( + "../../dist/examples/test-run-transaction/config/BLP_config.js", + "../../dist/packages/cactus-cmd-socketio-server/src/main/typescript/business-logic-plugin/" +); diff --git a/examples/test-run-transaction/copyStaticAssets.ts b/examples/test-run-transaction/copyStaticAssets.ts index 9191697a70..d5eff4d85d 100644 --- a/examples/test-run-transaction/copyStaticAssets.ts +++ b/examples/test-run-transaction/copyStaticAssets.ts @@ -5,10 +5,10 @@ * copyStaticAssets.ts */ -import * as shell from 'shelljs'; +import * as shell from "shelljs"; // NOTE: Copy the static assets to the dist folder. // Example: // shell.cp('-R', 'src/routing-interface/views', 'dist/routing-interface/views/'); -shell.cp('-R', 'config/default.json', '../../dist/examples/test-run-transaction/config/'); -shell.cp('-R', 'config/usersetting.json', '../../dist/packages/config/'); +shell.cp("-R", "config/default.yaml", "/etc/cactus/"); +shell.cp("-R", "config/usersetting.yaml", "/etc/cactus/"); diff --git a/examples/test-run-transaction/package.json b/examples/test-run-transaction/package.json index 2e2a7876f8..03919c5fdb 100644 --- a/examples/test-run-transaction/package.json +++ b/examples/test-run-transaction/package.json @@ -2,8 +2,8 @@ "name": "test-run-transaction", "private": true, "scripts": { - "start": "node ../../dist/packages/routing-interface/www.js", - "debug": "nodemon --inspect ../../dist/packages/routing-interface/www.js", + "start": "node ../../dist/packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/www.js", + "debug": "nodemon --inspect ../../dist/packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/www.js", "build": "npm run build-ts && npm run copy-static-assets && npm run copy-blp-config && npm run replace-blp-config-path", "build-ts": "tsc -p ./tsconfig.json", "tslint": "tslint -c tslint.json -p tsconfig.json './*.ts'", @@ -34,7 +34,13 @@ "xmlhttprequest": "^1.8.0" }, "devDependencies": { + "@typescript-eslint/eslint-plugin": "^4.31.1", + "@typescript-eslint/parser": "^4.31.1", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-prettier": "^4.0.0", + "prettier": "^2.4.0", "tslint": "6.0.0", - "typescript": "3.9.3" + "typescript": "^3.9.3" } } diff --git a/examples/test-run-transaction/replaceBLPConfigPath.ts b/examples/test-run-transaction/replaceBLPConfigPath.ts index c6620d13ce..c944f16e80 100644 --- a/examples/test-run-transaction/replaceBLPConfigPath.ts +++ b/examples/test-run-transaction/replaceBLPConfigPath.ts @@ -4,19 +4,21 @@ * * ReplacePath.js */ -const fs = require('fs') +const fs = require("fs"); -const targetFile = '../../dist/packages/config/BLP_config.js'; +const targetFile = + "../../dist/packages/cactus-cmd-socketio-server/src/main/typescript/business-logic-plugin/BLP_config.js"; const srcStr = '"../BusinessLogicRunTransaction"'; -const distStr = '"../../examples/test-run-transaction/BusinessLogicRunTransaction"'; +const distStr = + '"../../../../../../examples/test-run-transaction/BusinessLogicRunTransaction"'; -fs.readFile(targetFile, 'utf8', (readErr, data) => { +fs.readFile(targetFile, "utf8", (readErr, data) => { if (readErr) { return console.log(readErr); } const result = data.replace(srcStr, distStr); - fs.writeFile(targetFile, result, 'utf8', (writeErr) => { - if (writeErr) return console.log(writeErr); + fs.writeFile(targetFile, result, "utf8", (writeErr) => { + if (writeErr) return console.log(writeErr); }); }); diff --git a/examples/test-run-transaction/supply-chain-app-stub/app/app.ts b/examples/test-run-transaction/supply-chain-app-stub/app/app.ts index 3ea88a20f8..e4e769ff6f 100644 --- a/examples/test-run-transaction/supply-chain-app-stub/app/app.ts +++ b/examples/test-run-transaction/supply-chain-app-stub/app/app.ts @@ -6,13 +6,13 @@ */ // Load the library -import express from 'express'; -import helmet from 'helmet'; -import cors from 'cors'; +import express from "express"; +import helmet from "helmet"; +import cors from "cors"; const app = express(); app.use(helmet()); app.use(cors()); -const bodyParser = require('body-parser'); +const bodyParser = require("body-parser"); //import indexRouter from './routes/index'; ///import loginRouter from './routes/login'; @@ -32,23 +32,25 @@ app.use(bodyParser.json()); // Dynamic loading console.debug(`start Dynamic loading`); const targetJsArray = [ -// {uri: '/api/v1/login/', jsPath: './routes/login.js'}, -// {uri: '/api/v1/cars/', jsPath: './routes/cars.js'}, - {uri: '/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/test-run-transaction/', jsPath: './routes/supply-chain-app.js'} + // {uri: '/api/v1/login/', jsPath: './routes/login.js'}, + // {uri: '/api/v1/cars/', jsPath: './routes/cars.js'}, + { + uri: "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/test-run-transaction/", + jsPath: "./routes/supply-chain-app.js", + }, ]; -for (var targetJs of targetJsArray) { - console.debug(`url: ${targetJs.uri}, jsPath: ${targetJs.jsPath}`); - // var targetRouter = require(targetJs.jsPath).default; - app.use(targetJs.uri, require(targetJs.jsPath).default); +for (const targetJs of targetJsArray) { + console.debug(`url: ${targetJs.uri}, jsPath: ${targetJs.jsPath}`); + // var targetRouter = require(targetJs.jsPath).default; + app.use(targetJs.uri, require(targetJs.jsPath).default); } - const port = process.env.PORT || 5053; // Specify the port number -app.get('/helloWorld', (req, res) => { - res.status(200).send({ message: 'hello, world' }); +app.get("/helloWorld", (req, res) => { + res.status(200).send({ message: "hello, world" }); }); // Server startup app.listen(port); -console.log('listen on port ' + port); +console.log("listen on port " + port); diff --git a/examples/test-run-transaction/supply-chain-app-stub/app/routes/supply-chain-app.ts b/examples/test-run-transaction/supply-chain-app-stub/app/routes/supply-chain-app.ts index 3858f556ab..9f531b36fd 100644 --- a/examples/test-run-transaction/supply-chain-app-stub/app/routes/supply-chain-app.ts +++ b/examples/test-run-transaction/supply-chain-app-stub/app/routes/supply-chain-app.ts @@ -5,23 +5,22 @@ * supply-chain-app.ts */ -import { Router, NextFunction, Request, Response } from 'express'; +import { Router, NextFunction, Request, Response } from "express"; const router: Router = Router(); /* GET home page. */ -router.get('/', (req: Request, res: Response, next: NextFunction) => { +router.get("/", (req: Request, res: Response, next: NextFunction) => { try { //res.render('index', { title: 'Express' }); res.status(200).send("supply-chain-app:GET!!\n"); - } catch (err) { next(err); } }); /* POST home page. */ -router.post('/', (req: Request, res: Response, next: NextFunction) => { +router.post("/", (req: Request, res: Response, next: NextFunction) => { try { //res.render('index', { title: 'Express' }); console.debug(`req1: ${JSON.stringify(req.body)}`); @@ -32,27 +31,24 @@ router.post('/', (req: Request, res: Response, next: NextFunction) => { console.debug(`invocationType: ${req.body.invocationType}`); console.debug(`functionName: ${req.body.functionName}`); console.debug(`functionArgs: ${req.body.functionArgs}`); - sleep(5, function() { - console.debug(`##send response`); - res.status(200).send(JSON.stringify({"supply-chain-app": "POST..."})); + sleep(5, function () { + console.debug(`##send response`); + res.status(200).send(JSON.stringify({ "supply-chain-app": "POST..." })); }); - } catch (err) { next(err); } }); - function sleep(waitSec: number, callbackFunc: any) { - var spanedSec = 0; - var id = setInterval(function () { - spanedSec++; - if (spanedSec >= waitSec) { - clearInterval(id); - if (callbackFunc) callbackFunc(); - } - }, 1000); - + let spanedSec = 0; + var id = setInterval(function () { + spanedSec++; + if (spanedSec >= waitSec) { + clearInterval(id); + if (callbackFunc) callbackFunc(); + } + }, 1000); } export default router; diff --git a/examples/test-run-transaction/test-run-transaction.ts b/examples/test-run-transaction/test-run-transaction.ts index a8517ce271..938724fd73 100644 --- a/examples/test-run-transaction/test-run-transaction.ts +++ b/examples/test-run-transaction/test-run-transaction.ts @@ -5,31 +5,31 @@ * test-run-transaction.ts */ -import { Router, NextFunction, Request, Response } from 'express'; -import { TransactionManagement } from '../../packages/routing-interface/TransactionManagement'; -import { RIFError } from '../../packages/routing-interface/RIFError'; -import { ConfigUtil } from '../../packages/routing-interface/util/ConfigUtil'; +import { Router, NextFunction, Request, Response } from "express"; +import { TransactionManagement } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/TransactionManagement"; +import { RIFError } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/RIFError"; +import { ConfigUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/ConfigUtil"; -const fs = require('fs'); -const path = require('path'); +const fs = require("fs"); +const path = require("path"); const config: any = ConfigUtil.getConfig(); import { getLogger } from "log4js"; -const moduleName = 'test-run-transaction'; +const moduleName = "test-run-transaction"; const logger = getLogger(`${moduleName}`); logger.level = config.logLevel; const router: Router = Router(); -export const transactionManagement: TransactionManagement = new TransactionManagement(); +export const transactionManagement: TransactionManagement = + new TransactionManagement(); // Request Execution of Test-Run-Transaction -router.post('/', (req: Request, res: Response, next: NextFunction) => { +router.post("/", (req: Request, res: Response, next: NextFunction) => { try { console.log("test-run-transaction()"); const tradeID: string = transactionManagement.startBusinessLogic(req); - const result = {tradeID: tradeID}; + const result = { tradeID: tradeID }; res.status(200).json(result); - } catch (err) { if (err instanceof RIFError) { res.status(err.statusCode); diff --git a/examples/test-run-transaction/tsconfig.json b/examples/test-run-transaction/tsconfig.json index 7c65beb89b..98a8691880 100644 --- a/examples/test-run-transaction/tsconfig.json +++ b/examples/test-run-transaction/tsconfig.json @@ -18,7 +18,7 @@ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ // "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ - // "outDir": "./dist/lib/", + // "outDir": "./dist/lib/", /* Redirect output structure to the directory. */ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "composite": true, /* Enable project compilation */ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */