[CO-354] Fix wallet-new "example1" test

This test was failing, apparently due to the increased sizes of
`AddrAttributes` in the NMJust case. I added 4 bytes to the maximum
byte limit, which is the amount by which `AddrAttributes` grows when
the `NetworkMagic` value is added.

wallet-new/test/unit/Test/Infrastructure/Generator.hs

@@ -23,7 +23,8 @@ import           UTxO.Generator
 import           Wallet.Inductive
 import           Wallet.Inductive.Generator
 
-import           Pos.Core ( TxSizeLinear, calculateTxSizeLinear )
+import           Pos.Core (TxSizeLinear, calculateTxSizeLinear)
+import           Pos.Crypto (RequiresNetworkMagic (..))
 import           Serokell.Data.Memory.Units (Byte, fromBytes)
 
 {-------------------------------------------------------------------------------
@@ -51,20 +52,21 @@ data GeneratorModel h a = GeneratorModel {
     , gmMaxNumOurs    :: Int
 
       -- | Estimate fees
-    , gmEstimateFee   :: Int -> [Value] -> Value
+    , gmEstimateFee   :: RequiresNetworkMagic -> Int -> [Value] -> Value
     }
 
-genChainUsingModel :: (Hash h a, Ord a) => GeneratorModel h a -> Gen (Chain h a)
-genChainUsingModel GeneratorModel{..} =
+genChainUsingModel :: (Hash h a, Ord a)
+                   => RequiresNetworkMagic -> GeneratorModel h a -> Gen (Chain h a)
+genChainUsingModel rnm GeneratorModel{..} =
     evalStateT (genChain params) initState
   where
-    params    = defChainParams gmEstimateFee gmAllAddresses
+    params    = defChainParams (gmEstimateFee rnm) gmAllAddresses
     initUtxo  = utxoRestrictToAddr (`elem` gmAllAddresses) $ trUtxo gmBoot
     initState = initTrState initUtxo 1
 
-genInductiveUsingModel :: (Hash h a, Ord a)
-                       => GeneratorModel h a -> Gen (Inductive h a)
-genInductiveUsingModel GeneratorModel{..} = do
+genInductiveUsingModel :: (Hash h a, Ord a) => RequiresNetworkMagic
+                       -> GeneratorModel h a -> Gen (Inductive h a)
+genInductiveUsingModel rnm GeneratorModel{..} = do
     numOurs <- choose (1, min (length potentialOurs) gmMaxNumOurs)
     addrs'  <- shuffle potentialOurs
     let ours = Set.fromList (take numOurs addrs')
@@ -76,7 +78,8 @@ genInductiveUsingModel GeneratorModel{..} = do
       }
   where
     potentialOurs = filter gmPotentialOurs gmAllAddresses
-    params ours   = defEventsParams gmEstimateFee gmAllAddresses ours initUtxo
+    params ours   =
+        defEventsParams (gmEstimateFee rnm) gmAllAddresses ours initUtxo
     initUtxo      = utxoRestrictToAddr (`elem` gmAllAddresses) $ trUtxo gmBoot
     initState     = initEventsGlobalState 1
 
@@ -91,7 +94,7 @@ simpleModel :: GeneratorModel GivenHash Char
 simpleModel = GeneratorModel {
       gmAllAddresses  = addrs
     , gmPotentialOurs = \_ -> True
-    , gmEstimateFee   = \_ _ -> 0
+    , gmEstimateFee   = \_ _ _ -> 0
     , gmMaxNumOurs    = 3
     , gmBoot          = Transaction {
                             trFresh = fromIntegral (length addrs) * initBal
@@ -176,9 +179,12 @@ estimateSize saa sta ins outs
 --   NOTE: The average size of @Attributes AddrAttributes@ and
 --         the transaction attributes @Attributes ()@ are both hard-coded
 --         here with some (hopefully) realistic values.
-estimateCardanoFee :: TxSizeLinear -> Int -> [Value] -> Value
-estimateCardanoFee linearFeePolicy ins outs
-    = round (calculateTxSizeLinear linearFeePolicy (estimateSize 128 16 ins outs))
+estimateCardanoFee :: TxSizeLinear -> RequiresNetworkMagic -> Int -> [Value] -> Value
+estimateCardanoFee linearFeePolicy rnm ins outs
+    = round (calculateTxSizeLinear linearFeePolicy (estimateSize addrAttrSize 16 ins outs))
+  where
+    addrAttrSize = 128 + (case rnm of NMMustBeNothing -> 0
+                                      NMMustBeJust    -> 4)
 
 {-------------------------------------------------------------------------------
   Auxiliary

wallet-new/test/unit/Test/Infrastructure/Genesis.hs

@@ -11,6 +11,7 @@ import           UTxO.Context
 import           UTxO.DSL
 
 import           Pos.Core (TxSizeLinear)
+import           Pos.Crypto (RequiresNetworkMagic)
 import           Test.Infrastructure.Generator (estimateCardanoFee)
 
 {-------------------------------------------------------------------------------
@@ -35,12 +36,13 @@ data GenesisValues h = GenesisValues {
     , hashBoot :: h (Transaction h Addr)
 
       -- | Fee policy
-    , txFee :: Int -> [Value] -> Value
+    , txFee    :: Int -> [Value] -> Value
     }
 
 -- | Compute genesis values from the bootstrap transaction
-genesisValues :: (Hash h Addr) => TxSizeLinear -> Transaction h Addr -> GenesisValues h
-genesisValues txSizeLinear boot@Transaction{..} = GenesisValues{..}
+genesisValues :: (Hash h Addr) => TxSizeLinear
+              -> RequiresNetworkMagic -> Transaction h Addr -> GenesisValues h
+genesisValues txSizeLinear rnm boot@Transaction{..} = GenesisValues{..}
   where
     initR0 = unsafeHead [val | Output a val <- trOuts, a == r0]
 
@@ -52,7 +54,7 @@ genesisValues txSizeLinear boot@Transaction{..} = GenesisValues{..}
 
     hashBoot = hash boot
 
-    txFee = estimateCardanoFee  txSizeLinear
+    txFee = estimateCardanoFee txSizeLinear rnm
 
 {-------------------------------------------------------------------------------
   Auxiliary

wallet-new/test/unit/Test/Spec/Kernel.hs

@@ -43,7 +43,8 @@ runWithMagic rnm = do
 specBody :: ProtocolMagic -> Spec
 specBody pm =
     it "Compare wallet kernel to pure model" $
-      forAll (genInductiveUsingModel model) $ \ind -> do
+      let rnm = getRequiresNetworkMagic pm in
+      forAll (genInductiveUsingModel rnm model) $ \ind -> do
         -- TODO: remove once we have support for rollback in the kernel
         let indDontRoll = uptoFirstRollback ind
         bracketActiveWallet pm $ \activeWallet -> do

wallet-new/test/unit/Test/Spec/Models.hs

@@ -45,10 +45,11 @@ runWithMagic rnm = do
 specBody :: ProtocolMagic -> Spec
 specBody pm =
     describe "Test pure wallets" $ do
+      let rnm = getRequiresNetworkMagic pm
       it "Using simple model" $
-        forAll (genInductiveUsingModel simpleModel) $ testPureWalletWith
+        forAll (genInductiveUsingModel rnm simpleModel) $ testPureWalletWith
       it "Using Cardano model" $
-        forAll (genInductiveUsingModel (cardanoModel linearFeePolicy boot)) $ testPureWalletWith
+        forAll (genInductiveUsingModel rnm (cardanoModel linearFeePolicy boot)) $ testPureWalletWith
   where
     transCtxt = runTranslateNoErrors pm ask
     boot      = bootstrapTransaction transCtxt

wallet-new/test/unit/Test/Spec/Translation.hs

@@ -62,8 +62,9 @@ specBody pm = do
 
     describe "Translation QuickCheck tests" $ do
       prop "can translate randomly generated chains" $
+        let rnm = getRequiresNetworkMagic pm in
         forAll
-          (intAndVerifyGen pm (genChainUsingModel . cardanoModel linearFeePolicy))
+          (intAndVerifyGen pm (genChainUsingModel rnm . cardanoModel linearFeePolicy))
           expectValid
 
   where
@@ -188,7 +189,9 @@ intAndVerifyPure :: ProtocolMagic
                  -> (GenesisValues GivenHash -> Chain GivenHash Addr)
                  -> ValidationResult GivenHash Addr
 intAndVerifyPure pm txSizeLinear pc = runIdentity $
-    intAndVerify pm (Identity . pc . genesisValues txSizeLinear)
+    intAndVerify pm (Identity . pc . genesisValues txSizeLinear rnm)
+  where
+    rnm = getRequiresNetworkMagic pm
 
 -- | Specialization of 'intAndVerify' to 'Gen'
 intAndVerifyGen :: ProtocolMagic -> (Transaction GivenHash Addr