Move membership related files into membership dir

index.js

@@ -40,9 +40,9 @@ var Dissemination = require('./lib/dissemination.js');
 var errors = require('./lib/errors.js');
 var getTChannelVersion = require('./lib/util.js').getTChannelVersion;
 var HashRing = require('./lib/ring');
-var Membership = require('./lib/membership.js');
-var MembershipIterator = require('./lib/membership-iterator.js');
-var MembershipUpdateRollup = require('./lib/membership-update-rollup.js');
+var Membership = require('./lib/membership/index.js');
+var MembershipIterator = require('./lib/membership/iterator.js');
+var MembershipUpdateRollup = require('./lib/membership/rollup.js');
 var nulls = require('./lib/nulls');
 var rawHead = require('./lib/request-proxy/util.js').rawHead;
 var RequestProxy = require('./lib/request-proxy/index.js');

lib/membership-set-listener.js

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var Member = require('./member.js');
+var Member = require('./membership/member.js');
 
 module.exports = function createMembershipSetListener(ringpop) {
     return function onMembershipSet(updates) {

lib/membership-update-listener.js

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var Member = require('./member.js');
+var Member = require('./membership/member.js');
 
 module.exports = function createListener(ringpop) {
     return function onMembershipUpdated(updates) {

lib/membership.js → lib/membership/index.js

@@ -23,8 +23,8 @@ var _ = require('underscore');
 var EventEmitter = require('events').EventEmitter;
 var farmhash = require('farmhash');
 var Member = require('./member.js');
-var MembershipUpdateRules = require('./membership-update-rules.js');
-var mergeMembershipChangesets = require('./membership-changeset-merge.js');
+var MembershipUpdateRules = require('./rules.js');
+var mergeMembershipChangesets = require('./merge.js');
 var util = require('util');
 var uuid = require('node-uuid');
 

lib/membership-iterator.js → lib/membership/iterator.js

@@ -17,7 +17,6 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
 'use strict';
 
 function MembershipIterator(ring) {

lib/swim/join-response-merge.js

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var mergeMembershipChangesets = require('../membership-changeset-merge.js');
+var mergeMembershipChangesets = require('../membership/merge.js');
 
 function hasSameChecksums(joinResponses) {
     var lastChecksum = -1;

test/join-response-merge-test.js

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var Member = require('../lib/member.js');
+var Member = require('../lib/membership/member.js');
 var mergeJoinResponses = require('../lib/swim/join-response-merge.js');
 var testRingpop = require('./lib/test-ringpop.js');
 

test/membership-changeset-merge-test.js

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var mergeMembershipChangesets = require('../lib/membership-changeset-merge.js');
+var mergeMembershipChangesets = require('../lib/membership/merge.js');
 var testRingpop = require('./lib/test-ringpop.js');
 
 testRingpop('merges incarnation numbers', function t(deps, assert) {

test/membership-iterator-test.js

@@ -17,11 +17,9 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-var MembershipIterator = require('../lib/membership-iterator.js');
 var testRingpop = require('./lib/test-ringpop.js');
 
 testRingpop('iterates over two members correctly', function t(deps, assert) {
-    var ringpop = deps.ringpop;
     var membership = deps.membership;
     var iterator = deps.iterator;
 
@@ -36,7 +34,6 @@ testRingpop('iterates over two members correctly', function t(deps, assert) {
 });
 
 testRingpop('iterates over three members correctly', function t(deps, assert) {
-    var ringpop = deps.ringpop;
     var membership = deps.membership;
     var iterator = deps.iterator;
 
@@ -53,7 +50,6 @@ testRingpop('iterates over three members correctly', function t(deps, assert) {
 });
 
 testRingpop('skips over faulty member and 1 local member', function t(deps, assert) {
-    var ringpop = deps.ringpop;
     var membership = deps.membership;
     var iterator = deps.iterator;
 

test/membership-test.js

@@ -21,7 +21,7 @@
 'use strict';
 
 // Test dependencies
-var Member = require('../lib/member.js');
+var Member = require('../lib/membership/member.js');
 
 // Test helpers
 var testRingpop = require('./lib/test-ringpop.js');

test/membership-update-rollup-test.js

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var MembershipUpdateRollup = require('../lib/membership-update-rollup.js');
+var MembershipUpdateRollup = require('../lib/membership/rollup.js');
 var Ringpop = require('../index.js');
 var test = require('tape');
 var testRingpop = require('./lib/test-ringpop.js');

test/swim_test.js

@@ -18,9 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-var Member = require('../lib/member.js');
-var Ringpop = require('../index.js');
-var test = require('tape');
+var Member = require('../lib/membership/member.js');
 var testRingpop = require('./lib/test-ringpop.js');
 
 testRingpop('starting and stopping gossip sets timer / unsets timers', function t(deps, assert) {