fix: validation & remove exceptionMiddleware

weaveVM · Oct 31, 2022 · 2e1f18d · 2e1f18d
1 parent f7564d9
commit 2e1f18d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/src/server.ts b/src/server.ts
@@ -1,8  1,8 @@
 import express from 'express';
 import bodyParser from 'body-parser';
-import { JSONRPCErrorException, JSONRPCServer, JSONRPCServerMiddleware } from 'json-rpc-2.0';
 import { JSONRPCServer, JSONRPCServerMiddleware } from 'json-rpc-2.0';
 import { RPCTx } from './types';
-import { InternalError } from './errors';
 // import { InternalError } from './errors';
 import { VerifyingProvider } from './provider';
 import { validators } from './validation';
 
@@ -100,19  100,12 @@ export function getJSONRPCServer(provider: VerifyingProvider) {
     return BigInt(provider.chainId()).toString();
   });
 
-  const exceptionMiddleware: JSONRPCServerMiddleware<void> = async (next, request, serverParams) => {
-    try {
-      console.log(`RPC Request ${request.method}`);
-      return await next(request, serverParams);
-    } catch (error) {
-      if (error instanceof JSONRPCErrorException) {
-        throw error;
-      }
-      throw new InternalError(error.message);
-    }
   const logMiddleware: JSONRPCServerMiddleware<void> = async (next, request, serverParams) => {
     console.log(`RPC Request ${request.method}`);
     return await next(request, serverParams);
   };
 
-  server.applyMiddleware(exceptionMiddleware);
   server.applyMiddleware(logMiddleware);
   return server;
 }
 

diff --git a/src/validation.ts b/src/validation.ts
@@ -63,7  63,6 @@ export const validators = {
 
     const blockOption = params[index];
 
-    console.log(blockOption);
     if (['latest', 'earliest', 'pending'].includes(blockOption)) {
       return;
     }
@@ -112,19  111,18 @@ export const validators = {
 
     const tx = params[index];
 
-    const validate = (field: any, validator: Function) => {
-      if (field === undefined) return;
-      return validator([field], index);
-    };
-
     // validate addresses
     for (const field of [tx.to, tx.from]) {
-      validate(field, this.address);
       // TODO: the below will create an error with incorrect index if the tx is not at index 0
       if (field !== undefined)
         this.address([field], 0);
     }
 
     // validate hex
     for (const field of [tx.gas, tx.gasPrice, tx.value, tx.data]) {
-      validate(field, this.hex);
       // TODO: the below will create an error with incorrect index if the tx is not at index 0
       if (field !== undefined)
          this.hex([field], 0);
     }
   },
 };