SERVER-22359 Move ensureShardVersionOkOrThrow to CollectionShardingState

This ensures that we will have assertions in place for the correct locks
being held.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/mongo/scripting/mozjs/db.cpp b/src/mongo/scripting/mozjs/db.cpp
index 0a107ba3953..97112595037 100644
--- a/src/mongo/scripting/mozjs/db.cpp
+++ b/src/mongo/scripting/mozjs/db.cpp
@@ -59,8 +59,7 @@ void DBInfo::getProperty(JSContext* cx,
 
             if (o.hasOwnField(InternedString::_fullName)) {
                 // need to check every time that the collection did not get sharded
-                if (haveLocalShardingInfo(opContext->getClient(),
-                                          o.getString(InternedString::_fullName)))
+                if (haveLocalShardingInfo(opContext, o.getString(InternedString::_fullName)))
                     uasserted(ErrorCodes::BadValue, "can't use sharded collection from db.eval");
             }
         }
diff --git a/src/mongo/scripting/mozjs/dbcollection.cpp b/src/mongo/scripting/mozjs/dbcollection.cpp
index 2cc03a752e1..8d094721f8f 100644
--- a/src/mongo/scripting/mozjs/dbcollection.cpp
+++ b/src/mongo/scripting/mozjs/dbcollection.cpp
@@ -75,8 +75,9 @@ void DBCollectionInfo::construct(JSContext* cx, JS::CallArgs args) {
     std::string fullName = ValueWriter(cx, args.get(3)).toString();
 
     auto context = scope->getOpContext();
-    if (context && haveLocalShardingInfo(context->getClient(), fullName))
+    if (context && haveLocalShardingInfo(context, fullName)) {
         uasserted(ErrorCodes::BadValue, "can't use sharded collection from db.eval");
+    }
 
     args.rval().setObjectOrNull(thisv);
 }