There's no point in supplying a default for the callback

squaremo · squaremo · commit 8a34b30ae93a · 2014-04-06T23:09:04.000+01:00
Promises ignore null or undefined continuations anyway.
diff --git a/lib/sockets.js b/lib/sockets.js
@@ -10,9 +10,6 @@ var Duplex   = Stream.Duplex   || require('readable-stream/duplex');
 
 var delay = global.setImmediate || process.nextTick;
 
-// A default value to substitute when we don't get a callback
-function ignore() {}
-
 // Do the tedious string-or-buffer conversion. If I was using byte
 // streams, this would be done automatically; however I'm using
 // streams in object mode.
@@ -33,6 +30,9 @@ function errorLater(obj) {
   }
 }
 
+function ignore() {} // for stubbing out methods I don't care about;
+                     // i.e., _read
+
 function Context(url) {
   EventEmitter.call(this);
   var self = this;
@@ -75,7 +75,7 @@ Context.prototype.socket = function(type, options) {
 
 Context.prototype.close = function(callback) {
   this._connection.then(function(c) {
-    c.close().then(callback || ignore);
+    c.close().then(callback);
   });
 };
 
@@ -181,7 +181,7 @@ PubSocket.prototype.connect = function(destination, callback) {
                     {durable: false, autoDelete: false})
     .then(function(ok) {
       self.pubs.push(destination);
-    }).then(callback || ignore);
+    }).then(callback);
 };
 
 PubSocket.prototype.publish = function(topic, chunk, encoding) {
@@ -241,7 +241,7 @@ SubSocket.prototype.connect = function(source, topic, callback) {
     .then(function(ok) {
       return ch.bindQueue(queue, source, topic);
     })
-    .then(callback || ignore);
+    .then(callback);
 };
 
 // AMQP and the stream API don't really work well together here. I'm
@@ -267,7 +267,7 @@ PushSocket.prototype.connect = function(destination, callback) {
   ch.assertQueue(destination, {durable: this.options.persistent})
     .then(function(ok) {
       self.queues.push(destination);
-    }).then(callback || ignore);
+    }).then(callback);
 };
 
 PushSocket.prototype.write = function(chunk, encoding) {
@@ -306,7 +306,7 @@ PullSocket.prototype.connect = function(source, callback) {
       }, {noAck:false}).then(function(ok) {
         self.consumers[source] = ok.consumerTag;
       });
-    }).then(callback || ignore);
+    }).then(callback);
 };
 
 PullSocket.prototype._read = ignore;
@@ -335,7 +335,7 @@ WorkerSocket.prototype.connect = function(source, callback) {
       }, {noAck:false}).then(function(ok) {
         self.consumers[source] = ok.consumerTag;
       });
-    }).then(callback || ignore);
+    }).then(callback);
 };
 
 WorkerSocket.prototype.ack = function() {
@@ -397,7 +397,7 @@ ReqSocket.prototype.connect = function(destination, callback) {
   ch.assertQueue(destination, {durable: this.options.persistent})
     .then(function(ok) {
       self.queues.push(ok.queue);
-    }).then(callback || ignore);
+    }).then(callback);
 };
 
 ReqSocket.prototype.write = function(chunk, encoding) {
@@ -448,7 +448,7 @@ RepSocket.prototype.connect = function(source, callback) {
       }, {noAck:false}).then(function(ok) {
         self.consumers[source] = ok.consumerTag;
       });
-    }).then(callback || ignore);
+    }).then(callback);
 };
 
 RepSocket.prototype.write = function(chunk, encoding) {
@@ -493,7 +493,7 @@ TaskSocket.prototype.connect = function(destination, callback) {
                  {durable: this.options.persistent})
     .then(function(ok) {
       queues.push(destination);
-    }).then(callback || ignore);
+    }).then(callback);
 };
 
 TaskSocket.prototype.write = function(chunk, encoding) {
