From 48d3b7ec2576c2b0c07af10fc0c53a08a866a982 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Sep 2016 23:11:04 -0400 Subject: more refactor --- Storage.hs | 1 + Storage/Local.hs | 2 +- Storage/Network.hs | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Storage.hs b/Storage.hs index 43e16cd..8f67ea9 100644 --- a/Storage.hs +++ b/Storage.hs @@ -10,6 +10,7 @@ import Types.Storage import Share import Storage.Local import Storage.Network +import Servers import Data.Monoid import Data.Maybe import System.FilePath diff --git a/Storage/Local.hs b/Storage/Local.hs index 38fc5b7..b9f0f3e 100644 --- a/Storage/Local.hs +++ b/Storage/Local.hs @@ -7,7 +7,7 @@ module Storage.Local (localStorage, storageDir, testStorageDir, uploadQueue) whe import Types import Types.Storage -import Storage.Network (Server(..)) +import Servers import Serialization () import qualified Data.ByteString as B import qualified Data.ByteString.UTF8 as U8 diff --git a/Storage/Network.hs b/Storage/Network.hs index b6b778a..21909d4 100644 --- a/Storage/Network.hs +++ b/Storage/Network.hs @@ -6,10 +6,7 @@ {-# LANGUAGE OverloadedStrings #-} module Storage.Network ( - Server(..), - networkServers, networkStorage, - torableManager ) where import Types -- cgit v1.2.3