Keep with the rustic aesthetic

uber · Apr 13, 2015 · 8721e3e · 8721e3e
1 parent d50940b
commit 8721e3e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 27 deletions.
diff --git a/node/as/thrift.js b/node/as/thrift.js
@@ -60,15 +60,15 @@ function register(channel, name, opts, handle) {
 
         handle(opts, inHead, inBody, handleThriftResponse);
 
-        function handleThriftResponse(error, response) {
-            if (error) {
-                return res.sendError('UnexpectedError', error.message);
+        function handleThriftResponse(err, thriftRes) {
+            if (err) {
+                return res.sendError('UnexpectedError', err.message);
             }
 
             // TODO {head,body} or {arg2,arg3}?
 
-            var ok = response.ok;
-            var outBody = response.body;
+            var ok = thriftRes.ok;
+            var outBody = thriftRes.body;
 
             if (typeof ok !== 'boolean') {
                 throw new Error('Expected true or false boolean on response object');
@@ -94,7 +94,7 @@ function register(channel, name, opts, handle) {
             var outBodyBuffer = resultType.toBuffer(outResult).toValue();
 
             // TODO process outHeadBuffer
-            // var outHead = response.head;
+            // var outHead = res.head;
             var outHeadBuffer = null;
 
             if (ok) {
@@ -148,9 +148,7 @@ function send(request, endpoint, outHead, outBody, callback) {
         // var inHeadBuffer = arg2;
         var inHead = null;
 
-        var response = new Response(res.ok, inHead, inBody);
-
-        callback(null, response);
+        callback(null, new Response(res.ok, inHead, inBody));
     }
 
 };

diff --git a/node/test/as-thrift.js b/node/test/as-thrift.js
@@ -28,10 +28,10 @@ var TChannelAsThrift = require('../as/thrift.js');
 var thriftify = require('thriftify');
 
 function NoEchoError(value) {
-    var error = new Error('No echo');
-    error.nameAsThrift = 'noEcho';
-    error.value = value;
-    return error;
+    var err = new Error('No echo');
+    err.nameAsThrift = 'noEcho';
+    err.value = value;
+    return err;
 }
 
 function echo(opts, head, body, cb) {
@@ -59,18 +59,18 @@ tape('send and receive thrift an ok service call', function (assert) {
             host: server.hostPort
         }), 'Chamber::echo', null, {value: 10}, handleResponse);
 
-        function handleResponse(error, response) {
-            if (error) return done(error);
-            assert.ok(response.ok);
-            assert.equals(response.body, 10);
+        function handleResponse(err, res) {
+            if (err) return done(err);
+            assert.ok(res.ok);
+            assert.equals(res.body, 10);
             done();
         }
 
     });
 
-    function done(error) {
-        if (error) {
-            assert.ifError(error);
+    function done(err) {
+        if (err) {
+            assert.ifErr(err);
         }
         server.close();
         assert.end();
@@ -94,18 +94,18 @@ tape('send and receive thrift a not ok service call', function (assert) {
             host: server.hostPort
         }), 'Chamber::echo', null, {value: 10}, handleResponse);
 
-        function handleResponse(error, response) {
-            if (error) return done(error);
-            assert.ok(!response.ok);
-            assert.equals(response.body.value, 10);
+        function handleResponse(err, res) {
+            if (err) return done(err);
+            assert.ok(!res.ok);
+            assert.equals(res.body.value, 10);
             done();
         }
 
     });
 
-    function done(error) {
-        if (error) {
-            assert.ifError(error);
+    function done(err) {
+        if (err) {
+            assert.ifErr(err);
         }
         server.close();
         assert.end();