Assorted other cleanup

Author: markerikson

packages/toolkit/src/query/core/buildThunks.ts

@@ -486,8 +486,6 @@ In the case of an unhandled error, no tags will be "provided" or "invalidated".`
       const endpointDefinition =
         endpointDefinitions[queryThunkArgs.endpointName]
 
-      // console.trace('Query thunk: ', currentArg)
-
       // Order of these checks matters.
       // In order for `upsertQueryData` to successfully run while an existing request is in flight,
       /// we have to check for that first, otherwise `queryThunk` will bail out and not run at all.

packages/toolkit/src/query/react/buildHooks.ts

@@ -715,7 +715,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
             requestId,
           })
         )
-        // console.log('Probe subscription check: ', returnedValue)
+
         currentRenderHasSubscription = !!returnedValue
       }
 

packages/toolkit/src/query/tests/buildHooks.test.tsx

@@ -89,11 +89,7 @@ let actions: AnyAction[] = []
 
 const storeRef = setupApiStore(
   api,
-  {
-    // actions(state: AnyAction[] = [], action: AnyAction) {
-    //   return [...state, action]
-    // },
-  },
+  {},
   {
     middleware: {
       prepend: [listenerMiddleware.middleware],
@@ -133,7 +129,9 @@ describe('hooks tests', () => {
       }
 
       render(<User />, { wrapper: storeRef.wrapper })
-      expect(getRenderCount()).toBe(2) // By the time this runs, the initial render will happen, and the query will start immediately running by the time we can expect this
+      // By the time this runs, the initial render will happen, and the query
+      //  will start immediately running by the time we can expect this
+      expect(getRenderCount()).toBe(2)
 
       await waitFor(() =>
         expect(screen.getByTestId('isFetching').textContent).toBe('false')