Remove cckey context

Author: Joonmo Yang

bin/www.ts

@@ -4,15 +4,14 @@
 
 import * as debugModule from "debug";
 import { createApp } from "../src/app";
-import { closeContext } from "../src/context";
 const debug = debugModule("faucet:server");
 import * as http from "http";
 
 main();
 
 async function main() {
  try {
- const [app, context] = await createApp();
+ const app = await createApp();
 
  /**
  * Get port from environment and store in Express.
@@ -51,8 +50,6 @@ async function main() {
  } catch (err) {
  console.error(`Error at closing ${err}`);
  } finally {
- console.log("Cleanup context");
- await closeContext(context);
  process.exit();
  }
  });

src/__test__/ping.spec.ts

@@ -1,19 +1,11 @@
 import { Application } from "express";
 import * as request from "supertest";
 import { createApp } from "../app";
-import { closeContext, Context } from "../context";
 
 let app: Application;
-let context: Context;
 
 beforeEach(async () => {
- const res = await createApp();
- app = res[0];
- context = res[1];
-});
-
-afterEach(async () => {
- await closeContext(context);
+ app = await createApp();
 });
 
 test("ping", async () => {

src/app.ts

@@ -7,11 +7,10 @@ import { Model } from "objection";
 import * as path from "path";
 const morganBody = require("morgan-body");
 
-import { Context, createContext } from "./context";
 import { createRouter as createApiRouter } from "./routes/api";
 import { createRouter as createPingRouter } from "./routes/ping";
 
-export async function createApp(): Promise<[express.Application, Context]> {
+export async function createApp(): Promise<express.Application> {
  Model.knex(knex(config.get("knex")));
  const app = express();
 
@@ -24,9 +23,8 @@ export async function createApp(): Promise<[express.Application, Context]> {
  app.use(express.static(path.join(__dirname, "public")));
  morganBody(app);
 
- const context = await createContext();
- app.use("/api", createApiRouter(context));
- app.use("/ping", createPingRouter(context));
+ app.use("/api", createApiRouter());
+ app.use("/ping", createPingRouter());
 
  // catch 404 and forward to error handler
  app.use((req, res, next) => {
@@ -44,5 +42,5 @@ export async function createApp(): Promise<[express.Application, Context]> {
  res.status(err.status || 500);
  res.render("error");
  });
- return [app, context];
+ return app;
 }

src/context.ts

@@ -7,7 +7,6 @@ import {
  signEcdsa
 } from "codechain-primitives";
 import * as express from "express";
-import { Context } from "../context";
 import KeyModel from "../models/key";
 
 type KeyType = "asset" | "platform";
@@ -19,7 +18,7 @@ function findKey(
  return KeyModel.query().findById([type, address]) as any;
 }
 
-export function createRouter(context: Context) {
+export function createRouter() {
  const router = express.Router();
 
  router.get("/keys", async (req, res) => {

src/routes/api.ts

@@ -1,21 +1,12 @@
 import * as express from "express";
-import { Context } from "../context";
 
-export function createRouter(context: Context) {
+export function createRouter() {
  const router = express.Router();
 
  router.get("/", async (req, res) => {
- try {
- await context.cckey.platform.getKeys();
- res.json({
- success: true
- });
- } catch (err) {
- res.json({
- success: false,
- error: err
- });
- }
+ res.json({
+ success: true
+ });
  });
 
  return router;