Move defs to DA.ContractKeys

verified import is needed in
sdk/compiler/damlc/tests/daml-test-files/QueryNByKey.daml

Author: roger-bosman-da

sdk/compiler/damlc/daml-stdlib-src/DA/ContractKeys.daml

@@ -5,12 +5,12 @@
 
 module DA.ContractKeys where
 
+#ifdef DAML_NUCK
 import DA.Internal.Template.Functions as DA
 
-#ifdef DAML_NUCK
 queryNByKey : forall t k. HasQueryNByKey t k => Int -> k -> Update [(ContractId t, t)]
 queryNByKey = DA.queryNByKey
 
 queryAllByKey : forall t k. HasQueryNByKey t k => k -> Update [(ContractId t, t)]
-queryAllByKey = queryNByKey (maxBound @Int)
+queryAllByKey = DA.queryNByKey (maxBound @Int)
 #endif

sdk/compiler/damlc/daml-stdlib-src/LibraryModules.daml

@@ -13,6 +13,7 @@ import DA.Action.State
 import DA.Assert
 import DA.BigNumeric
 import DA.Bifunctor
+import DA.ContractKeys
 import DA.Crypto.Text
 import DA.Date
 import DA.Either

sdk/compiler/damlc/tests/daml-test-files/QueryNByKey.daml

@@ -5,7 +5,7 @@
 
 module QueryNByKey where
 
--- import Daml.Script
+import DA.ContractKeys
 
 template WithKey
   with
@@ -28,14 +28,14 @@ template Helper
              pure ()
            [] ->
              abort "Assertion failed: queryNByKey returned an empty list."
---    choice PerformQueryAllByKey : ()
---      controller p
---      do contracts <- queryAllByKey @WithKey p
---         case contracts of
---           (contract :: _) -> do
---             pure ()
---           [] ->
---             abort "Assertion failed: queryAllByKey returned an empty list."
+    choice PerformQueryAllByKey : ()
+      controller p
+      do contracts <- queryAllByKey @WithKey p
+         case contracts of
+           (contract :: _) -> do
+             pure ()
+           [] ->
+             abort "Assertion failed: queryAllByKey returned an empty list."
 
 -- Test just here to assert that queryNByKey compiles
 -- When we have an ledger implementation, assert things actually run