diff --git a/src/Simplex/FileTransfer/Client.hs b/src/Simplex/FileTransfer/Client.hs index f991798e6..69896408c 100644 --- a/src/Simplex/FileTransfer/Client.hs +++ b/src/Simplex/FileTransfer/Client.hs @@ -25,6 +25,7 @@ import qualified Network.HTTP2.Client as H import Simplex.FileTransfer.Description (mb) import Simplex.FileTransfer.Protocol import Simplex.FileTransfer.Transport +import Simplex.Messaging.Builder (Builder, builder) import Simplex.Messaging.Client ( NetworkConfig (..), ProtocolClientError (..), @@ -35,7 +36,6 @@ import Simplex.Messaging.Client transportClientConfig, ) import Simplex.Messaging.Client.Agent () -import Simplex.Messaging.Builder (Builder, builder) import qualified Simplex.Messaging.Crypto as C import qualified Simplex.Messaging.Crypto.Lazy as LC import Simplex.Messaging.Encoding.String diff --git a/src/Simplex/FileTransfer/Protocol.hs b/src/Simplex/FileTransfer/Protocol.hs index dad1b059f..19d458107 100644 --- a/src/Simplex/FileTransfer/Protocol.hs +++ b/src/Simplex/FileTransfer/Protocol.hs @@ -17,7 +17,6 @@ import Control.Applicative ((<|>)) import qualified Data.Aeson.TH as J import qualified Data.Attoparsec.ByteString.Char8 as A import Data.Bifunctor (first) -import Simplex.Messaging.Builder (Builder) import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as B import Data.Kind (Type) @@ -25,6 +24,7 @@ import Data.List.NonEmpty (NonEmpty (..)) import Data.Maybe (isNothing) import Data.Type.Equality import Data.Word (Word32) +import Simplex.Messaging.Builder (Builder) import qualified Simplex.Messaging.Crypto as C import Simplex.Messaging.Encoding import Simplex.Messaging.Encoding.String diff --git a/src/Simplex/Messaging/Client.hs b/src/Simplex/Messaging/Client.hs index 7d69de1c7..1d941ca08 100644 --- a/src/Simplex/Messaging/Client.hs +++ b/src/Simplex/Messaging/Client.hs @@ -85,8 +85,6 @@ import Control.Monad import Control.Monad.IO.Class (liftIO) import Control.Monad.Trans.Except import qualified Data.Aeson.TH as J -import Simplex.Messaging.Builder (Builder) -import qualified Simplex.Messaging.Builder as BB import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as B import Data.Functor (($>)) @@ -98,6 +96,8 @@ import Data.Maybe (fromMaybe) import Data.Time.Clock (UTCTime, getCurrentTime) import Network.Socket (ServiceName) import Numeric.Natural +import Simplex.Messaging.Builder (Builder) +import qualified Simplex.Messaging.Builder as BB import qualified Simplex.Messaging.Crypto as C import Simplex.Messaging.Encoding import Simplex.Messaging.Encoding.String diff --git a/src/Simplex/Messaging/Crypto.hs b/src/Simplex/Messaging/Crypto.hs index 64e20543a..d6a24f772 100644 --- a/src/Simplex/Messaging/Crypto.hs +++ b/src/Simplex/Messaging/Crypto.hs @@ -191,8 +191,6 @@ import Data.ByteArray (ByteArrayAccess) import qualified Data.ByteArray as BA import Data.ByteString.Base64 (decode, encode) import qualified Data.ByteString.Base64.URL as U -import Simplex.Messaging.Builder (Builder, byteString, word16BE) -import qualified Simplex.Messaging.Builder as BB import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as B import Data.ByteString.Lazy (fromStrict, toStrict) @@ -208,6 +206,8 @@ import Database.SQLite.Simple.FromField (FromField (..)) import Database.SQLite.Simple.ToField (ToField (..)) import GHC.TypeLits (ErrorMessage (..), KnownNat, Nat, TypeError, natVal, type (+)) import Network.Transport.Internal (decodeWord16, encodeWord16) +import Simplex.Messaging.Builder (Builder, byteString, word16BE) +import qualified Simplex.Messaging.Builder as BB import Simplex.Messaging.Encoding import Simplex.Messaging.Encoding.String import Simplex.Messaging.Parsers (blobFieldDecoder, parseAll, parseString) diff --git a/src/Simplex/Messaging/Encoding.hs b/src/Simplex/Messaging/Encoding.hs index 9c5f331e2..846d071a1 100644 --- a/src/Simplex/Messaging/Encoding.hs +++ b/src/Simplex/Messaging/Encoding.hs @@ -22,8 +22,6 @@ where import Data.Attoparsec.ByteString.Char8 (Parser) import qualified Data.Attoparsec.ByteString.Char8 as A import Data.Bits (shiftL, shiftR, (.|.)) -import Simplex.Messaging.Builder (Builder, word16BE) -import qualified Simplex.Messaging.Builder as BB import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as B import Data.ByteString.Internal (c2w, w2c) @@ -32,6 +30,8 @@ import qualified Data.List.NonEmpty as L import Data.Time.Clock.System (SystemTime (..)) import Data.Word (Word16, Word32) import Network.Transport.Internal (decodeWord16, decodeWord32, encodeWord16, encodeWord32) +import Simplex.Messaging.Builder (Builder, word16BE) +import qualified Simplex.Messaging.Builder as BB import Simplex.Messaging.Parsers (parseAll) import Simplex.Messaging.Util ((<$?>)) diff --git a/src/Simplex/Messaging/Protocol.hs b/src/Simplex/Messaging/Protocol.hs index eda67ec8a..da5296337 100644 --- a/src/Simplex/Messaging/Protocol.hs +++ b/src/Simplex/Messaging/Protocol.hs @@ -161,8 +161,6 @@ import Data.Aeson (FromJSON (..), ToJSON (..)) import qualified Data.Aeson.TH as J import Data.Attoparsec.ByteString.Char8 (Parser, ()) import qualified Data.Attoparsec.ByteString.Char8 as A -import Simplex.Messaging.Builder (Builder, char8, lazyByteString) -import qualified Simplex.Messaging.Builder as BB import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as B import qualified Data.ByteString.Lazy.Char8 as LB @@ -179,6 +177,8 @@ import Data.Time.Clock.System (SystemTime (..)) import Data.Type.Equality import GHC.TypeLits (ErrorMessage (..), TypeError, type (+)) import Network.Socket (HostName, ServiceName) +import Simplex.Messaging.Builder (Builder, char8, lazyByteString) +import qualified Simplex.Messaging.Builder as BB import qualified Simplex.Messaging.Crypto as C import Simplex.Messaging.Encoding import Simplex.Messaging.Encoding.String diff --git a/src/Simplex/Messaging/Transport.hs b/src/Simplex/Messaging/Transport.hs index e0c6e088f..554b9a00a 100644 --- a/src/Simplex/Messaging/Transport.hs +++ b/src/Simplex/Messaging/Transport.hs @@ -67,7 +67,6 @@ import qualified Data.Aeson.TH as J import Data.Attoparsec.ByteString.Char8 (Parser) import Data.Bifunctor (first) import Data.Bitraversable (bimapM) -import Simplex.Messaging.Builder (Builder, byteString, toLazyByteString) import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as B import qualified Data.ByteString.Lazy.Char8 as LB @@ -79,6 +78,7 @@ import Network.Socket import qualified Network.TLS as T import qualified Network.TLS.Extra as TE import qualified Paths_simplexmq as SMQ +import Simplex.Messaging.Builder (Builder, byteString, toLazyByteString) import qualified Simplex.Messaging.Crypto as C import Simplex.Messaging.Encoding import Simplex.Messaging.Parsers (dropPrefix, parse, parseRead1, sumTypeJSON)