[DEVOPS-1131] Fix merge errors & compiler complaints

Author: Michael Hueschen

lib/src/Pos/Launcher/Configuration.hs

@@ -31,6 +31,7 @@ module Pos.Launcher.Configuration
        , ccNode_L
        , ccWallet_L
        , ccReqNetMagic_L
+       , ccTxValRules_L
 
        , cfoFilePath_L
        , cfoKey_L
@@ -148,7 +149,8 @@ instance FromJSON Configuration where
         pure $ Configuration {..}
 
 instance ToJSON Configuration where
-    toJSON (Configuration genesis ntp update ssc dlg txp block node wallet reqnetmagic) = object [
+    toJSON (Configuration genesis ntp update ssc dlg txp block node
+                          wallet reqNetMagic txValRules) = object [
         "genesis" .= genesis
       , "ntp" .= ntp
       , "update" .= update
@@ -158,7 +160,8 @@ instance ToJSON Configuration where
       , "block" .= block
       , "node" .= node
       , "wallet" .= wallet
-      , "requiresNetworkMagic" .= reqnetmagic
+      , "requiresNetworkMagic" .= reqNetMagic
+      , "txValidationRules" .= txValRules
       ]
 
 data WalletConfiguration = WalletConfiguration

script-runner/common/BrickUI.hs

@@ -19,7 +19,7 @@ import qualified Data.Text as T
 import qualified Data.Text.Lazy.Builder as T
 import qualified Data.Vector as V
 import           Formatting
-import           Universum hiding (HashMap, list, on, state, when)
+import           Universum hiding (HashMap, list, on, state)
 
 import           Brick (App (App, appAttrMap, appChooseCursor, appDraw, appHandleEvent, appStartEvent),
                      BrickEvent (AppEvent, VtyEvent), EventM, Next, Widget,
@@ -143,8 +143,8 @@ proposalUi state = do
   let
     renderProposal :: Either ConfirmedProposalState (UpId,ProposalState) -> Widget Name
     renderProposal (Left proposal) = renderUpdateProposalLabel (str "Confirmed: ") (cpsUpdateProposal proposal)
-    renderProposal (Right (upid, PSUndecided prop)) = renderUpdateProposalLabel (str "Undecided: ") (upsProposal prop)
-    renderProposal (Right (upid, PSDecided prop)) = renderUpdateProposalLabel (str "Decided: ") (upsProposal $ dpsUndecided prop)
+    renderProposal (Right (_upid, PSUndecided prop)) = renderUpdateProposalLabel (str "Undecided: ") (upsProposal prop)
+    renderProposal (Right (_upid, PSDecided prop)) = renderUpdateProposalLabel (str "Decided: ") (upsProposal $ dpsUndecided prop)
   let
     renderProposalState :: (UpId, ProposalState) -> Widget Name
     renderProposalState (upid, PSDecided prop) = do

script-runner/common/OrphanedLenses.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE TemplateHaskell   #-}
 
-module OrphanedLenses where
+module OrphanedLenses () where
 
 import           Control.Lens (makeLensesWith)
 

script-runner/common/PocMode.hs

@@ -49,8 +49,6 @@ import           Data.Default (Default (def))
 import qualified Data.Map as Map
 import           Prelude (show)
 
-import           BrickUITypes (CustomEvent)
-
 import           Pos.Chain.Block (HasSlogContext (slogContext),
                      HasSlogGState (slogGState))
 import           Pos.Chain.Genesis as Genesis (Config)
@@ -59,8 +57,7 @@ import           Pos.Client.KeyStorage (MonadKeys (modifySecret),
                      MonadKeysRead (getSecret), getSecretDefault,
                      modifySecretDefault)
 import           Pos.Context (HasNodeContext (nodeContext))
-import           Pos.Core (SlotCount, SlotId)
-import           Pos.Core (HasPrimaryKey (primaryKey))
+import           Pos.Core (HasPrimaryKey (primaryKey), SlotCount, SlotId)
 import           Pos.Core.JsonLog (CanJsonLog (jsonLog))
 import           Pos.Core.Reporting (HasMisbehaviorMetrics (misbehaviorMetrics),
                      MonadReporting (report))
@@ -263,6 +260,6 @@ instance MonadKeys PocMode where
 type instance MempoolExt PocMode = EmptyMempoolExt
 
 instance MonadTxpLocal PocMode where
-    txpNormalize pm = withReaderT _acRealModeContext . txNormalize pm
+    txpNormalize pm tvr = withReaderT _acRealModeContext . txNormalize pm tvr
     txpProcessTx genesisConfig txpConfig = withReaderT _acRealModeContext . txProcessTransaction genesisConfig txpConfig