Revert "SERVER-19855 Include min OpTime with shard version"

This reverts commit cec89b290906adb7d36507d20d619aaa5a6f6c16.

1 files changed, 17 insertions, 2 deletions

diff --git a/src/mongo/s/ns_targeter.h b/src/mongo/s/ns_targeter.h
index 1e6182b67b7..087725697d2 100644
--- a/src/mongo/s/ns_targeter.h
+++ b/src/mongo/s/ns_targeter.h
@@ -157,11 +157,26 @@ struct ShardEndpoint {
     ShardEndpoint(const ShardEndpoint& other)
         : shardName(other.shardName), shardVersion(other.shardVersion) {}
 
-    ShardEndpoint(const std::string& shardName, const ChunkVersionAndOpTime& shardVersion)
+    ShardEndpoint(const std::string& shardName, const ChunkVersion& shardVersion)
         : shardName(shardName), shardVersion(shardVersion) {}
 
     const std::string shardName;
-    const ChunkVersionAndOpTime shardVersion;
+    const ChunkVersion shardVersion;
+
+    //
+    // For testing *only* - do not use as part of API
+    //
+
+    BSONObj toBSON() const {
+        BSONObjBuilder b;
+        appendBSON(&b);
+        return b.obj();
+    }
+
+    void appendBSON(BSONObjBuilder* builder) const {
+        builder->append("shardName", shardName);
+        shardVersion.addToBSON(*builder, "shardVersion");
+    }
 };
 
 }  // namespace mongo