client: kiln touchups (#1778)

* util/rpc.spec.ts: add more coverage cases

* re-add accidentially removed test

* slim withEngineMiddleware fn

Author: ryanio

packages/client/lib/util/rpc.ts

@@ -142,16 +142,16 @@ export function createRPCServerListener(opts: CreateRPCServerListenerOpts): Http
     const { jwtSecret, unlessFn } = withEngineMiddleware
     app.use((req, res, next) => {
       try {
-        if (unlessFn && unlessFn(req)) {
-          return next()
-        }
+        if (unlessFn && unlessFn(req)) return next()
         checkHeaderAuth(req, jwtSecret)
         return next()
       } catch (error) {
         if (error instanceof Error) {
           res.writeHead(401)
           res.end(`Unauthorized: ${error}`)
-        } else next(error)
+          return
+        }
+        next(error)
       }
     })
   }

packages/client/test/sync/fetcher/blockfetcher.spec.ts

@@ -64,6 +64,7 @@ tape('[BlockFetcher]', async (t) => {
     blockNumberList = [new BN(13), new BN(15)]
     min = new BN(13)
     fetcher.enqueueByNumberList(blockNumberList, min)
+    t.equals((fetcher as any).in.size(), 5, '2 new tasks for two non-subsequent block numbers')
 
     // Clear fetcher queue for next test of gap when following head
     fetcher.clear()

packages/client/test/util/rpc.spec.ts

@@ -27,18 +27,18 @@ tape('[Util/RPC]', (t) => {
           withEngineMiddleware: { jwtSecret: Buffer.alloc(32) },
         })
         const req = { id: 1, method: 'eth_getLatestBlock', params: [] }
-        const resp = { id: 1, result: { test: '123' } }
+        const resp = { id: 1, result: { test: '0x' + Buffer.alloc(64, 1).toString('hex') } }
         const reqBulk = [req, req]
         const respBulk = [resp, { id: 2, error: { err0: '456' } }]
         // Valid
         server.emit('request', req)
         server.emit('response', req, resp)
         server.emit('response', reqBulk, respBulk)
-        // Invalid, mismatch
-        server.emit('response', req, respBulk)
+        // Invalid
+        server.emit('response', req, []) // empty
+        server.emit('response', [req], respBulk) // mismatch length
 
-        st.ok(httpServer, 'should return http server')
-        st.ok(wsServer, 'should return ws server')
+        st.ok(httpServer && wsServer, 'should return http and ws servers')
       }
     }
     st.end()