constants: Move most paths to separate module

[ganeti-local] / htools / Ganeti / Confd.hs

diff --git a/htools/Ganeti/Confd.hs b/htools/Ganeti/Confd.hs
index 8fdf12d..6746f86 100644 (file)
--- a/htools/Ganeti/Confd.hs
+++ b/htools/Ganeti/Confd.hs
@@ -50,7 +50,7 @@ import Text.JSON
 
 import qualified Ganeti.Constants as C
 import Ganeti.THH
-import Ganeti.HTools.JSON
+import Ganeti.JSON
 
 {-
    Note that we re-export as is from Constants the following simple items:
@@ -89,14 +89,14 @@ $(makeJSONInstance ''ConfdReqField)
 -- converts them to strings anyway, as they're used as dict-keys.
 
 $(buildObject "ConfdReqQ" "confdReqQ"
-  [ renameField "Ip" $
+  [ renameField "Ip" .
                 optionalField $ simpleField C.confdReqqIp [t| String   |]
-  , renameField "IpList" $
+  , renameField "IpList" .
                 defaultField [| [] |] $
                 simpleField C.confdReqqIplist [t| [String] |]
-  , renameField "Link" $ optionalField $
+  , renameField "Link" . optionalField $
                 simpleField C.confdReqqLink [t| String   |]
-  , renameField "Fields" $ defaultField [| [] |] $
+  , renameField "Fields" . defaultField [| [] |] $
                 simpleField C.confdReqqFields [t| [ConfdReqField] |]
   ])
 
@@ -146,7 +146,7 @@ $(declareIADT "ConfdErrorType"
   ])
 $(makeJSONInstance ''ConfdErrorType)
 
-$(buildObject "ConfdRequest" "confdRq" $
+$(buildObject "ConfdRequest" "confdRq"
   [ simpleField "protocol" [t| Int |]
   , simpleField "type"     [t| ConfdRequestType |]
   , defaultField [| EmptyQuery |] $ simpleField "query" [t| ConfdQuery |]