Pre-PR feedback from Ben; joinBlacklist -> memberBlacklist

config.js

@@ -64,7 +64,7 @@ Config.prototype._seed = function _seed(seed) {
     seedOrDefault('dampScoringReuseLimit', 2500);
     seedOrDefault('dampScoringSuppressDuration', 60 * 60 * 1000); // 1 hr in ms
     seedOrDefault('dampScoringSuppressLimit', 5000);
-    seedOrDefault('joinBlacklist', [], function validator(vals) {
+    seedOrDefault('memberBlacklist', [], function validator(vals) {
         return _.all(vals, function all(val) {
             return val instanceof RegExp;
         });

server/protocol/join.js

@@ -23,6 +23,14 @@ var _ = require('underscore');
 var safeParse = require('../../lib/util').safeParse;
 var TypedError = require('error/typed');
 
+var BlacklistedError = TypedError({
+    type: 'ringpop.invalid-join.blacklist',
+    message: '{joiner} tried joining a cluster, but its host is part of the' +
+        ' blacklist: {blacklist}',
+    blacklist: null,
+    joiner: null
+});
+
 var DenyJoinError = TypedError({
     type: 'ringpop.deny-join',
     message: 'Node is currently configured to deny joins'
@@ -36,14 +44,6 @@ var InvalidJoinAppError = TypedError({
     actual: null
 });
 
-var InvalidJoinBlacklistError = TypedError({
-    type: 'ringpop.invalid-join.blacklist',
-    message: '{joiner} tried joining a cluster, but its host is part of the' +
-        ' blacklist: {blacklist}',
-    blacklist: null,
-    joiner: null
-});
-
 var InvalidJoinSourceError = TypedError({
     type: 'ringpop.invalid-join.source',
     message:  'A node tried joining a cluster by attempting to join itself.' +
@@ -68,9 +68,9 @@ function validateJoinerAddress(ringpop, joiner, callback) {
         return false;
     }
 
-    var blacklist = ringpop.config.get('joinBlacklist');
+    var blacklist = ringpop.config.get('memberBlacklist');
     if (Array.isArray(blacklist) && anyBlacklisted()) {
-        callback(InvalidJoinBlacklistError({
+        callback(BlacklistedError({
             joiner: joiner,
             blacklist: blacklist
         }));

test/integration/join-test.js

@@ -154,7 +154,7 @@ testRingpopCluster({
     tap: function tap(cluster) {
         // This'll make Node 0's join fail faster
         cluster[0].config.set('maxJoinAttempts', 1);
-        cluster[1].config.set('joinBlacklist', [/127.0.0.1:10000/]);
+        cluster[1].config.set('memberBlacklist', [/127.0.0.1:10000/]);
     }
 }, 'join blacklist', function t(bootRes, cluster, assert) {
     assert.notok(cluster[0].isReady, 'node one is not ready');

test/unit/config_test.js

@@ -75,18 +75,18 @@ test('no seed is OK', function t(assert) {
     assert.end();
 });
 
-test('validates joinBlacklist seed', function t(assert) {
+test('validates memberBlacklist seed', function t(assert) {
     var config = new Config(null, {
-        'joinBlacklist': ['127.0.0.1:3000']
+        'memberBlacklist': ['127.0.0.1:3000']
     });
-    assert.deepEquals([], config.get('joinBlacklist'),
+    assert.deepEquals([], config.get('memberBlacklist'),
         'uses default blacklist');
 
     var regexList = [/127.0.0.1:*/];
     config = new Config(null, {
-        'joinBlacklist': regexList
+        'memberBlacklist': regexList
     });
-    assert.deepEquals(regexList, config.get('joinBlacklist'),
+    assert.deepEquals(regexList, config.get('memberBlacklist'),
         'uses seed blacklist');
     assert.end();
 });

test/unit/server/protocol/join_test.js

@@ -27,7 +27,7 @@ test('join fails with blacklist error', function t(assert) {
     var ringpop = new Ringpop({
         app: 'ringpop',
         hostPort: '127.0.0.1:3000',
-        joinBlacklist: [/127.0.0.1:*/]
+        memberBlacklist: [/127.0.0.1:*/]
     });
     var handleProtocolJoin = createProtocolJoinHandler(ringpop);
     handleProtocolJoin(null, JSON.stringify({