Make the makeByronAddress arg order consistent with the Shelley one

IntersectMBO · Jul 8, 2020 · 29b76aa · 29b76aa
1 parent 59caced
commit 29b76aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/cardano-api/src/Cardano/Api/Typed.hs b/cardano-api/src/Cardano/Api/Typed.hs
@@ -709,13 +709,13 @@ instance SerialiseAddress StakeAddress where
       deserialiseFromBech32 AsStakeAddress t
 
 
-makeByronAddress :: VerificationKey ByronKey
-                 -> NetworkId
+makeByronAddress :: NetworkId
+                 -> VerificationKey ByronKey
                  -> Address era
-makeByronAddress (ByronVerificationKey vk) nid =
+makeByronAddress nw (ByronVerificationKey vk) =
     ByronAddress $
       Byron.makeVerKeyAddress
-        (toByronNetworkMagic nid)
+        (toByronNetworkMagic nw)
         vk
 
 

diff --git a/cardano-api/test/Test/Cardano/Api/Typed/Gen.hs b/cardano-api/test/Test/Cardano/Api/Typed/Gen.hs
@@ -24,13 +24,18 @@ import           Test.Cardano.Api.Gen (genSeed)
 import           Test.Cardano.Api.Orphans ()
 
 genAddressByron :: Gen (Address Byron)
-genAddressByron = makeByronAddress <$> genVerificationKey AsByronKey <*> genNetworkId
+genAddressByron = makeByronAddress <$> genNetworkId
+                                   <*> genVerificationKey AsByronKey
 
 genAddressShelley :: Gen (Address Shelley)
 genAddressShelley =
   Gen.choice
-    [ makeShelleyAddress <$> genNetworkId <*> genPaymentCredential <*> genStakeAddressReference
-    , makeByronAddress <$> genVerificationKey AsByronKey <*> genNetworkId
+    [ makeShelleyAddress <$> genNetworkId
+                         <*> genPaymentCredential
+                         <*> genStakeAddressReference
+
+    , makeByronAddress   <$> genNetworkId
+                         <*> genVerificationKey AsByronKey
     ]
 
 genKESPeriod :: Gen KESPeriod