SERVER-27995 make repl_set* naming convention consistent

2 files changed, 10 insertions, 10 deletions

diff --git a/src/mongo/dbtests/mock/mock_replica_set.cpp b/src/mongo/dbtests/mock/mock_replica_set.cpp
index 5005aec6f6c..77035a0f8f0 100644
--- a/src/mongo/dbtests/mock/mock_replica_set.cpp
+++ b/src/mongo/dbtests/mock/mock_replica_set.cpp
@@ -65,7 +65,7 @@ MockReplicaSet::MockReplicaSet(const string& setName, size_t nodes) : _setName(s
     }
     membersBuilder.done();
 
-    ReplicaSetConfig replConfig;
+    ReplSetConfig replConfig;
     fassert(28566, replConfig.initialize(configBuilder.obj()));
     fassert(28573, replConfig.validate());
     setConfig(replConfig);
@@ -129,7 +129,7 @@ void MockReplicaSet::setPrimary(const string& hostAndPort) {
 vector<string> MockReplicaSet::getSecondaries() const {
     vector<string> secondaries;
 
-    for (ReplicaSetConfig::MemberIterator member = _replConfig.membersBegin();
+    for (ReplSetConfig::MemberIterator member = _replConfig.membersBegin();
          member != _replConfig.membersEnd();
          ++member) {
         if (member->getHostAndPort() != HostAndPort(_primaryHost)) {
@@ -144,11 +144,11 @@ MockRemoteDBServer* MockReplicaSet::getNode(const string& hostAndPort) {
     return mapFindWithDefault(_nodeMap, hostAndPort, static_cast<MockRemoteDBServer*>(NULL));
 }
 
-repl::ReplicaSetConfig MockReplicaSet::getReplConfig() const {
+repl::ReplSetConfig MockReplicaSet::getReplConfig() const {
     return _replConfig;
 }
 
-void MockReplicaSet::setConfig(const repl::ReplicaSetConfig& newConfig) {
+void MockReplicaSet::setConfig(const repl::ReplSetConfig& newConfig) {
     _replConfig = newConfig;
     mockIsMasterCmd();
     mockReplSetGetStatusCmd();
@@ -228,7 +228,7 @@ void MockReplicaSet::mockIsMasterCmd() {
                 builder.append("buildIndexes", false);
             }
 
-            const ReplicaSetTagConfig tagConfig = _replConfig.getTagConfig();
+            const ReplSetTagConfig tagConfig = _replConfig.getTagConfig();
             if (member->hasTags(tagConfig)) {
                 BSONObjBuilder tagBuilder;
                 for (MemberConfig::TagIterator tag = member->tagsBegin(); tag != member->tagsEnd();
@@ -282,7 +282,7 @@ void MockReplicaSet::mockReplSetGetStatusCmd() {
             hostsField.push_back(selfStatBuilder.obj());
         }
 
-        for (ReplicaSetConfig::MemberIterator member = _replConfig.membersBegin();
+        for (ReplSetConfig::MemberIterator member = _replConfig.membersBegin();
              member != _replConfig.membersEnd();
              ++member) {
             MockRemoteDBServer* hostNode = getNode(member->getHostAndPort().toString());
diff --git a/src/mongo/dbtests/mock/mock_replica_set.h b/src/mongo/dbtests/mock/mock_replica_set.h
index b2b48747d8e..f6573be07b4 100644
--- a/src/mongo/dbtests/mock/mock_replica_set.h
+++ b/src/mongo/dbtests/mock/mock_replica_set.h
@@ -28,7 +28,7 @@
 #pragma once
 
 #include "mongo/db/repl/member_config.h"
-#include "mongo/db/repl/replica_set_config.h"
+#include "mongo/db/repl/repl_set_config.h"
 #include "mongo/dbtests/mock/mock_remote_db_server.h"
 
 #include <map>
@@ -68,7 +68,7 @@ public:
     std::string getSetName() const;
     std::string getConnectionString() const;
     std::vector<HostAndPort> getHosts() const;
-    repl::ReplicaSetConfig getReplConfig() const;
+    repl::ReplSetConfig getReplConfig() const;
     std::string getPrimary() const;
     std::vector<std::string> getSecondaries() const;
 
@@ -80,7 +80,7 @@ public:
      * Note: does not automatically select a new primary. Can be done manually by
      * calling setPrimary.
      */
-    void setConfig(const repl::ReplicaSetConfig& newConfig);
+    void setConfig(const repl::ReplSetConfig& newConfig);
 
     void setPrimary(const std::string& hostAndPort);
 
@@ -133,7 +133,7 @@ private:
 
     const std::string _setName;
     ReplNodeMap _nodeMap;
-    repl::ReplicaSetConfig _replConfig;
+    repl::ReplSetConfig _replConfig;
 
     std::string _primaryHost;
 };