Rename to Cardano.Environment.{HttpBridge, Jormungandr}

cardano-foundation · May 9, 2019 · 55389e4 · 55389e4
1 parent 8ad8c48
commit 55389e4
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 26 deletions.
diff --git a/exe/launcher/Main.hs b/exe/launcher/Main.hs
@@ -7,7 +7,7 @@ import Prelude
 
 import Cardano.CLI
     ( Port, parseArgWith )
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( Network, network )
 import Cardano.Launcher
     ( Command (Command)

diff --git a/exe/wallet/Main.hs b/exe/wallet/Main.hs
@@ -32,7 +32,7 @@ import Cardano.CLI
     , parseArgWith
     , putErrLn
     )
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( network )
 import Cardano.Wallet
     ( mkWalletLayer )

diff --git a/lib/http-bridge/cardano-wallet-http-bridge.cabal b/lib/http-bridge/cardano-wallet-http-bridge.cabal
@@ -57,7 +57,7 @@ library
   hs-source-dirs:
       src
   exposed-modules:
-      Cardano.Environment
+      Cardano.Environment.HttpBridge
       Cardano.Wallet.Binary.HttpBridge
       Cardano.Wallet.Compatibility.HttpBridge
       Cardano.Wallet.Network.HttpBridge
@@ -105,7 +105,7 @@ test-suite unit
   main-is:
       Main.hs
   other-modules:
-      Cardano.EnvironmentSpec
+      Cardano.Environment.HttpBridgeSpec
       Cardano.Wallet.Binary.HttpBridgeSpec
       Cardano.Wallet.Network.HttpBridge.ApiSpec
       Cardano.Wallet.Network.HttpBridgeSpec

diff --git a/lib/http-bridge/src/Cardano/Environment.hs → ...dge/src/Cardano/Environment/HttpBridge.hs b/lib/http-bridge/src/Cardano/Environment.hs → ...dge/src/Cardano/Environment/HttpBridge.hs
@@ -16,7 +16,7 @@
 -- rely on a `.env` file to bundle configuration settings together for a given
 -- target environment.
 
-module Cardano.Environment
+module Cardano.Environment.HttpBridge
     (
     -- * Networking
       Network(..)

diff --git a/lib/http-bridge/src/Cardano/Wallet/Binary/HttpBridge.hs b/lib/http-bridge/src/Cardano/Wallet/Binary/HttpBridge.hs
@@ -43,7 +43,7 @@ import Prelude
 
 import Cardano.Crypto.Wallet
     ( ChainCode (..), XPub (..) )
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( ProtocolMagic (..) )
 import Cardano.Wallet.Primitive.Types
     ( Address (..)

diff --git a/lib/http-bridge/src/Cardano/Wallet/Compatibility/HttpBridge.hs b/lib/http-bridge/src/Cardano/Wallet/Compatibility/HttpBridge.hs
@@ -17,7 +17,7 @@ module Cardano.Wallet.Compatibility.HttpBridge
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( Network (Mainnet, Staging, Testnet), network, protocolMagic )
 import Cardano.Wallet.Binary.HttpBridge
     ( encodeAddress, encodeProtocolMagic, encodeTx )

diff --git a/lib/http-bridge/src/Cardano/Wallet/Network/HttpBridge.hs b/lib/http-bridge/src/Cardano/Wallet/Network/HttpBridge.hs
@@ -21,7 +21,7 @@ module Cardano.Wallet.Network.HttpBridge
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( network )
 import Cardano.Wallet.Network
     ( ErrNetworkTip (..)

diff --git a/lib/http-bridge/src/Cardano/Wallet/Transaction/HttpBridge.hs b/lib/http-bridge/src/Cardano/Wallet/Transaction/HttpBridge.hs
@@ -9,7 +9,7 @@ module Cardano.Wallet.Transaction.HttpBridge
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( Network (..), ProtocolMagic (..), network, protocolMagic )
 import Cardano.Wallet.Binary.HttpBridge
     ( toByteString )

diff --git a/lib/http-bridge/test/bench/Main.hs b/lib/http-bridge/test/bench/Main.hs
@@ -7,7 +7,7 @@ module Main where
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( network )
 import Cardano.Launcher
     ( Command (Command), StdStream (..), installSignalHandlers, launch )

diff --git a/lib/http-bridge/test/integration/Cardano/Wallet/Network/HttpBridgeSpec.hs b/lib/http-bridge/test/integration/Cardano/Wallet/Network/HttpBridgeSpec.hs
@@ -7,7 +7,7 @@ module Cardano.Wallet.Network.HttpBridgeSpec
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( Network (..), network )
 import Cardano.Launcher
     ( Command (..), StdStream (..), launch )

diff --git a/lib/http-bridge/test/integration/Cardano/WalletSpec.hs b/lib/http-bridge/test/integration/Cardano/WalletSpec.hs
@@ -8,7 +8,7 @@ module Cardano.WalletSpec
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( network )
 import Cardano.Launcher
     ( Command (..), StdStream (..), launch )

diff --git a/lib/http-bridge/test/integration/Main.hs b/lib/http-bridge/test/integration/Main.hs
@@ -6,7 +6,7 @@ module Main where
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( Network (..), network )
 import Cardano.Launcher
     ( Command (..), StdStream (..), launch )

diff --git a/...idge/test/unit/Cardano/EnvironmentSpec.hs → ...nit/Cardano/Environment/HttpBridgeSpec.hs b/...idge/test/unit/Cardano/EnvironmentSpec.hs → ...nit/Cardano/Environment/HttpBridgeSpec.hs
@@ -3,11 +3,11 @@
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-module Cardano.EnvironmentSpec where
+module Cardano.Environment.HttpBridgeSpec where
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( ErrMissingOrInvalidEnvVar (..), Network, unsafeLookupEnv )
 import Data.Maybe
     ( isNothing )

diff --git a/lib/http-bridge/test/unit/Cardano/Wallet/Primitive/AddressDerivationSpec.hs b/lib/http-bridge/test/unit/Cardano/Wallet/Primitive/AddressDerivationSpec.hs
@@ -10,7 +10,7 @@ module Cardano.Wallet.Primitive.AddressDerivationSpec
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( Network (..), network )
 import Cardano.Wallet.Compatibility.HttpBridge
     ( HttpBridge )

diff --git a/lib/http-bridge/test/unit/Cardano/Wallet/Transaction/HttpBridgeSpec.hs b/lib/http-bridge/test/unit/Cardano/Wallet/Transaction/HttpBridgeSpec.hs
@@ -14,7 +14,7 @@ module Cardano.Wallet.Transaction.HttpBridgeSpec
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( Network (..), network )
 import Cardano.Wallet.Binary.HttpBridge
     ( encodeSignedTx, toByteString )

diff --git a/lib/http-bridge/test/unit/Main.hs b/lib/http-bridge/test/unit/Main.hs
@@ -2,7 +2,7 @@ module Main where
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.HttpBridge
     ( network )
 import Test.Hspec.Runner
     ( hspecWith )

diff --git a/lib/jormungandr/cardano-wallet-jormungandr.cabal b/lib/jormungandr/cardano-wallet-jormungandr.cabal
@@ -45,7 +45,7 @@ library
   hs-source-dirs:
       src
   exposed-modules:
-      Cardano.Environment
+      Cardano.Environment.Jormungandr
       Cardano.Wallet.Binary.Jormungandr
       Cardano.Wallet.Compatibility.Jormungandr
       Cardano.Wallet.Transaction.Jormungandr

diff --git a/lib/jormungandr/src/Cardano/Environment.hs → ...dr/src/Cardano/Environment/Jormungandr.hs b/lib/jormungandr/src/Cardano/Environment.hs → ...dr/src/Cardano/Environment/Jormungandr.hs
@@ -16,7 +16,7 @@
 -- rely on a `.env` file to bundle configuration settings together for a given
 -- target environment.
 
-module Cardano.Environment
+module Cardano.Environment.Jormungandr
     (
     -- * Networking
       Network(..)
@@ -130,22 +130,20 @@ unsafeLookupEnv k = unsafePerformIO $ do
 -------------------------------------------------------------------------------}
 
 -- | Available network options.
-data Network = Mainnet | Testnet | Staging
+data Network = Mainnet | Testnet
     deriving (Generic, Show, Eq, Enum)
 
 instance FromText Network where
     fromText = \case
         "mainnet" -> Right Mainnet
         "testnet" -> Right Testnet
-        "staging" -> Right Staging
         s -> Left $ TextDecodingError $ T.unpack s
-            <> " is neither \"mainnet\", \"testnet\" nor \"staging\"."
+            <> " is neither \"mainnet\" nor \"testnet\""
 
 instance ToText Network where
     toText = \case
         Mainnet -> "mainnet"
         Testnet -> "testnet"
-        Staging -> "staging"
 
 -- | Get the current target 'Network' from the Environment.
 --
@@ -162,5 +160,4 @@ newtype ProtocolMagic = ProtocolMagic Int32
 protocolMagic :: Network -> ProtocolMagic
 protocolMagic = \case
     Mainnet -> ProtocolMagic 764824073
-    Staging -> ProtocolMagic 633343913
     Testnet -> ProtocolMagic 1097911063
diff --git a/lib/jormungandr/test/unit/Main.hs b/lib/jormungandr/test/unit/Main.hs
@@ -2,7 +2,7 @@ module Main where
 
 import Prelude
 
-import Cardano.Environment
+import Cardano.Environment.Jormungandr
     ( network )
 import Test.Hspec.Runner
     ( hspecWith )