better types, small fixes

mlibre · May 25, 2024 · 61a778b · 61a778b
1 parent 8011106
commit 61a778b
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 28 deletions.
diff --git a/dist/API/app.js b/dist/API/app.js
diff --git a/dist/API/app.js.map b/dist/API/app.js.map
diff --git a/dist/API/blockchain.js b/dist/API/blockchain.js
diff --git a/dist/API/blockchain.js.map b/dist/API/blockchain.js.map
diff --git a/dist/API/routes/block.js b/dist/API/routes/block.js
diff --git a/dist/API/routes/block.js.map b/dist/API/routes/block.js.map
diff --git a/src/API/app.ts b/src/API/app.ts
@@ -46,21 +46,22 @@ function onError ( error: NodeJS.ErrnoException )
 	{
 		throw error;
 	}
-	// handle specific listen errors with friendly messages
 	switch ( error.code )
 	{
 	case "EACCES":
 		console.error( `${hostPort} requires elevated privileges` );
-		break;
+		process.exit( 1 );
+	// eslint-disable-next-line no-fallthrough
 	case "EADDRINUSE":
 		console.error( `${hostPort} is already in use` );
-		break;
+		process.exit( 1 );
+	// eslint-disable-next-line no-fallthrough
 	default:
 		throw error;
 	}
 }
 
-function errorHandler ( err: CustomError, req: express.Request, res: express.Response, next: express.NextFunction )
+function errorHandler ( err: SimpleError, req: express.Request, res: express.Response, next: express.NextFunction )
 {
 	if ( res.headersSent )
 	{

diff --git a/src/API/blockchain.ts b/src/API/blockchain.ts
@@ -1,9 +1,9 @@
 import Blockchain from "../library/main.js";
 import Consensus from "../library/pow-consensus.js";
-const consensus = new Consensus();
 import { initJsonFile } from "../library/utils.js";
 import Wallet from "../library/wallet.js";
 import { name, dbPath, minerKeysFile, hostUrl, nodesList } from "./config.js";
+const consensus = new Consensus();
 
 const minerKeys = initJsonFile( minerKeysFile, Wallet.generateKeyPair() );
 export default new Blockchain({

diff --git a/src/API/routes/block.ts b/src/API/routes/block.ts
@@ -12,21 +12,18 @@ router.get( "/", function ( req, res )
 	if ( !index && !from && !to && !list && !firstAndLast )
 	{
 		res.json( blockchain.chain.latestBlock );
-		return;
 	}
 	else if ( index )
 	{
 		const blockIndex = toNum( index );
 		res.json( blockchain.chain.get( blockIndex ) );
-		return;
 	}
 	else if ( from || to )
 	{
 		const blockFrom = toNum( from );
 		const blockTo = toNum( to );
 		const blocks = blockchain.getBlocks( blockFrom, blockTo );
 		res.json( blocks );
-		return;
 	}
 	else if ( list )
 	{
@@ -37,15 +34,13 @@ router.get( "/", function ( req, res )
 			blocks.push( blockchain.chain.get( blcokIndex ) );
 		}
 		res.json( blocks );
-		return;
 	}
 	else if ( firstAndLast )
 	{
 		const blocks = [];
 		blocks.push( blockchain.chain.get( 0 ) );
 		blocks.push( blockchain.chain.latestBlock );
 		res.json( blocks );
-		return;
 	}
 });
 

diff --git a/src/API/utils.ts b/src/API/utils.ts
@@ -20,7 +20,7 @@ export function toNum ( value: unknown ): number
 	return Number( value );
 }
 
-export function convertErrorToSimpleObj ( err: CustomError )
+export function convertErrorToSimpleObj ( err: SimpleError )
 {
 	if ( err.isAxiosError )
 	{

diff --git a/src/global.d.ts b/src/global.d.ts
@@ -64,11 +64,6 @@ interface ErrorWithStdsOutErr extends Error
 	status?: number;
 }
 
-interface CustomError extends Error
-{
-	[x: string]: CustomError;
-}
-
 interface SimpleError
 {
 	message?: string;