Merge pull request 'Update UnifiedAddress
to use named types for receivers' (#24) from rav001 into dev040
Reviewed-on: #24
This commit is contained in:
commit
5c4b715a24
1 changed files with 9 additions and 9 deletions
|
@ -279,19 +279,19 @@ instance FromJSON ShieldedOutput where
|
|||
-- * Orchard
|
||||
-- | Type to represent a Unified Address
|
||||
data UnifiedAddress = UnifiedAddress
|
||||
{ ua_net :: ZcashNet
|
||||
, o_rec :: BS.ByteString
|
||||
, s_rec :: BS.ByteString
|
||||
, t_rec :: Maybe TransparentAddress
|
||||
{ ua_net :: !ZcashNet
|
||||
, o_rec :: !OrchardReceiver
|
||||
, s_rec :: !SaplingReceiver
|
||||
, t_rec :: !(Maybe TransparentAddress)
|
||||
} deriving (Prelude.Show, Eq, Read)
|
||||
|
||||
-- | Helper type for marshalling UAs
|
||||
data RawUA = RawUA
|
||||
{ raw_net :: Word8
|
||||
, raw_o :: BS.ByteString
|
||||
, raw_s :: BS.ByteString
|
||||
, raw_t :: BS.ByteString
|
||||
, raw_to :: BS.ByteString
|
||||
{ raw_net :: !Word8
|
||||
, raw_o :: !BS.ByteString
|
||||
, raw_s :: !BS.ByteString
|
||||
, raw_t :: !BS.ByteString
|
||||
, raw_to :: !BS.ByteString
|
||||
} deriving stock (Eq, Prelude.Show, GHC.Generic)
|
||||
deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
|
||||
deriving anyclass (Data.Structured.Show)
|
||||
|
|
Loading…
Reference in a new issue