From ebfac8438f8daacb8156c40b8694dcc7412c34d9 Mon Sep 17 00:00:00 2001 From: "Rene V. Vergara" Date: Thu, 18 Apr 2024 08:30:14 -0400 Subject: [PATCH] rvv040 - decodeExchangeAddress modified to return an ExcahngeAddress object --- src/ZcashHaskell/Transparent.hs | 8 ++++---- test/Spec.hs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ZcashHaskell/Transparent.hs b/src/ZcashHaskell/Transparent.hs index a76be58..4bdc46d 100644 --- a/src/ZcashHaskell/Transparent.hs +++ b/src/ZcashHaskell/Transparent.hs @@ -159,8 +159,8 @@ encodeExchangeAddress net tr = do Just vhash _ -> Nothing --- | Decode an Exchange Address into a TransparentAddress -decodeExchangeAddress:: T.Text-> Maybe TransparentAddress +-- | Decode an Exchange Address into a ExchangeAddress +decodeExchangeAddress:: T.Text-> Maybe ExchangeAddress decodeExchangeAddress ex = do if (T.length ex ) > 1 then do @@ -174,12 +174,12 @@ decodeExchangeAddress ex = do let transparentReceiver = bytes rawd if hr == tMain then Just $ - TransparentAddress MainNet $ + ExchangeAddress MainNet $ TransparentReceiver P2PKH (fromRawBytes transparentReceiver) else do if hr == tTest then Just $ - TransparentAddress TestNet $ + ExchangeAddress TestNet $ TransparentReceiver P2PKH (fromRawBytes transparentReceiver) else Nothing else Nothing diff --git a/test/Spec.hs b/test/Spec.hs index 245b824..7c868e7 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -1081,8 +1081,8 @@ main = do case exch of Nothing -> assertFailure "Failed to encode Exchange address" Just addr -> do - let tadr = decodeExchangeAddress addr - tadr `shouldNotBe` Nothing + let eadr = decodeExchangeAddress addr + eadr `shouldNotBe` Nothing -- | Properties prop_PhraseLength :: Property