address comments

src/Pact/GasModel/GasTests.hs

@@ -42,11 +42,8 @@ import Pact.JSON.Legacy.Value
 
 -- | Gas benchmark tests for Pact native functions
 allNatives :: [NativeDefName]
-allNatives = map fst (concatMap snd enhancedNatives) <> nonNatives
-  where
-    -- Note: Since we are forking natives, the `natives` list
-    -- does not fully capture all available natives for the tests.
-  enhancedNatives = hyperlaneAmendedDefs:natives
+allNatives = map fst (concatMap snd pact412Natives) <> nonNatives
+
 
 -- | Non-native concepts to benchmark
 nonNatives :: [NativeDefName]

src/Pact/Native.hs

@@ -21,7 +21,9 @@
 module Pact.Native
     ( natives
     , nativeDefs
+    , hyperlaneDefs
     , hyperlaneAmendedDefs
+    , pact412Natives
     , pact412NativeDefs
     , moduleToMap
     , distinctDef
@@ -144,10 +146,13 @@ natives =
 
 -- | Production native modules as a dispatch map.
 nativeDefs :: HM.HashMap Text Ref
-nativeDefs = mconcat $ map moduleToMap (hyperlaneDefs:natives)
+nativeDefs = mconcat $ map moduleToMap natives
+
+pact412Natives :: [NativeModule]
+pact412Natives = hyperlaneAmendedDefs:natives
 
 pact412NativeDefs :: HM.HashMap Text Ref
-pact412NativeDefs = foldMap moduleToMap $ hyperlaneAmendedDefs:natives
+pact412NativeDefs = foldMap moduleToMap pact412Natives
 
 moduleToMap :: NativeModule -> HM.HashMap Text Ref
 moduleToMap = HM.fromList . map (asString *** Direct) . snd

tests/GasModelSpec.hs

@@ -139,7 +139,7 @@ goldenSizeOfPactValues = do
 allNativesInGasTable :: Spec
 allNativesInGasTable = do
   it "all native functions should be in gas table" $ do
-    let justNatives = map (asString . fst) (concatMap snd $ hyperlaneAmendedDefs:natives)
+    let justNatives = map (asString . fst) (concatMap snd pact412Natives)
         absent li name = case (Map.lookup name defaultGasTable) of
           Nothing -> name : li
           Just _ -> li