SERVER-59302 Remove support in client code for commands wrapped with $query

The shell and internal client used to upconvert commands
wrapped in a "$query" or "query" to a well-formed OP_MSG.
This behavior is a holdover from when OP_QUERY was supported
and is no longer needed.

1 files changed, 1 insertions, 17 deletions

diff --git a/jstests/noPassthrough/shell_can_use_read_concern.js b/jstests/noPassthrough/shell_can_use_read_concern.js
index 82751f884b4..8f092efcf25 100644
--- a/jstests/noPassthrough/shell_can_use_read_concern.js
+++ b/jstests/noPassthrough/shell_can_use_read_concern.js
@@ -55,14 +55,6 @@ function runTests({withSession}) {
 
         let cmdName = Object.keys(cmdObjSeen)[0];
 
-        // If the command is in a wrapped form, then we look for the actual command object
-        // inside
-        // the query/$query object.
-        if (cmdName === "query" || cmdName === "$query") {
-            cmdObjSeen = cmdObjSeen[cmdName];
-            cmdName = Object.keys(cmdObjSeen)[0];
-        }
-
         if (expectedSession) {
             assert(cmdObjSeen.hasOwnProperty("lsid"),
                    "Expected operation " + tojson(cmdObjSeen) +
@@ -137,14 +129,6 @@ function runTests({withSession}) {
     });
 
     testCommandCanBeCausallyConsistent(function() {
-        assert.commandWorked(db.runCommand({query: {count: coll.getName()}}));
-    });
-
-    testCommandCanBeCausallyConsistent(function() {
-        assert.commandWorked(db.runCommand({$query: {count: coll.getName()}}));
-    });
-
-    testCommandCanBeCausallyConsistent(function() {
         assert.eq(5, coll.count());
     });
 
@@ -218,4 +202,4 @@ runTests({withSession: false});
 runTests({withSession: true});
 
 rst.stopSet();
-})();
+})();
\ No newline at end of file