simplify: rm revoke from sk/dn data type
This commit is contained in:
parent
3195ff5c81
commit
8708143f16
7 changed files with 21 additions and 54 deletions
|
|
@ -45,21 +45,16 @@ end
|
|||
|
||||
let signkey_data =
|
||||
let master_sig = Signatures.ExchangeSigningKeyValidity.caqti in
|
||||
let revoked_sig = option Signatures.MasterSigningKeyRevocation.caqti in
|
||||
custom
|
||||
~encode:(fun
|
||||
Signkey.
|
||||
{ pub; stamp_start; stamp_expire; stamp_end; master_sig; revoked_sig }
|
||||
->
|
||||
Ok (pub, stamp_start, stamp_expire, stamp_end, master_sig, revoked_sig))
|
||||
~decode:(fun
|
||||
(pub, stamp_start, stamp_expire, stamp_end, master_sig, revoked_sig) ->
|
||||
Ok { pub; stamp_start; stamp_expire; stamp_end; master_sig; revoked_sig })
|
||||
(t6 eddsa_pub time time time master_sig revoked_sig)
|
||||
Signkey.{ pub; stamp_start; stamp_expire; stamp_end; master_sig } ->
|
||||
Ok (pub, stamp_start, stamp_expire, stamp_end, master_sig))
|
||||
~decode:(fun (pub, stamp_start, stamp_expire, stamp_end, master_sig) ->
|
||||
Ok { pub; stamp_start; stamp_expire; stamp_end; master_sig })
|
||||
(t5 eddsa_pub time time time master_sig)
|
||||
|
||||
let denom_data =
|
||||
let master_sig = Signatures.DenominationKeyValidity.caqti in
|
||||
let revoked_sig = option Signatures.MasterDenominationKeyRevocation.caqti in
|
||||
custom
|
||||
~encode:(fun
|
||||
Denomination.
|
||||
|
|
@ -77,7 +72,6 @@ let denom_data =
|
|||
age_mask;
|
||||
h_pub;
|
||||
master_sig;
|
||||
revoked_sig;
|
||||
}
|
||||
->
|
||||
Ok
|
||||
|
|
@ -92,7 +86,7 @@ let denom_data =
|
|||
fee_refresh,
|
||||
fee_refund,
|
||||
age_mask,
|
||||
(h_pub, master_sig, revoked_sig) ))
|
||||
(h_pub, master_sig) ))
|
||||
~decode:(fun
|
||||
( pub,
|
||||
value,
|
||||
|
|
@ -105,7 +99,7 @@ let denom_data =
|
|||
fee_refresh,
|
||||
fee_refund,
|
||||
age_mask,
|
||||
(h_pub, master_sig, revoked_sig) )
|
||||
(h_pub, master_sig) )
|
||||
->
|
||||
Ok
|
||||
{
|
||||
|
|
@ -122,10 +116,9 @@ let denom_data =
|
|||
age_mask;
|
||||
h_pub;
|
||||
master_sig;
|
||||
revoked_sig;
|
||||
})
|
||||
(t12 rsa_pub amount time time time time amount amount amount amount int
|
||||
(t3 denom_hash master_sig revoked_sig))
|
||||
(t2 denom_hash master_sig))
|
||||
|
||||
let account_restrictions =
|
||||
custom
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue