From d149bf03647b09caa2af9e55a392251e4d619640 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 28 Aug 2016 16:40:24 -0400
Subject: simplify http api, remove apiversion

Not needed since all routes are tagged with the api version.
---
 HTTP/Client.hs | 10 ++++------
 HTTP/Server.hs |  6 +-----
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'HTTP')

diff --git a/HTTP/Client.hs b/HTTP/Client.hs
index 4a5106b..0a79ba0 100644
--- a/HTTP/Client.hs
+++ b/HTTP/Client.hs
@@ -13,13 +13,11 @@ import Servant.Client
 import Data.Proxy
 import Network.HTTP.Client (Manager)
 
-apiVersion :: Manager -> BaseUrl -> ClientM APIVersion
+httpAPI :: Proxy HttpAPI
+httpAPI = Proxy
+
 motd :: Manager -> BaseUrl -> ClientM Motd
 getObject :: StorableObjectIdent -> Maybe ProofOfWork -> Manager -> BaseUrl -> ClientM (ProofOfWorkRequirement StorableObject)
 putObject :: StorableObjectIdent -> Maybe ProofOfWork -> StorableObject -> Manager -> BaseUrl -> ClientM (ProofOfWorkRequirement StoreResult)
 countObjects :: Maybe ProofOfWork -> Manager -> BaseUrl -> ClientM (ProofOfWorkRequirement CountResult)
-apiVersion 
-	:<|> motd
-	:<|> getObject
-	:<|> putObject
-	:<|> countObjects = client (Proxy :: Proxy HttpAPI)
+motd :<|> getObject :<|> putObject :<|> countObjects = client httpAPI
diff --git a/HTTP/Server.hs b/HTTP/Server.hs
index a26cd5e..7086167 100644
--- a/HTTP/Server.hs
+++ b/HTTP/Server.hs
@@ -44,15 +44,11 @@ userAPI :: Proxy HttpAPI
 userAPI = Proxy
 
 server :: ServerState -> Server HttpAPI
-server st = apiVersion
-	:<|> motd
+server st = motd
 	:<|> getObject st
 	:<|> putObject st
 	:<|> countObjects st
 
-apiVersion :: Handler APIVersion
-apiVersion = return (APIVersion 1)
-
 motd :: Handler Motd
 motd = return $ Motd "Hello World!"
 
-- 
cgit v1.2.3