nizk: fix gotests
This commit is contained in:
parent
f25ee986b9
commit
e70a42194d
|
@ -32,7 +32,7 @@ type setupResp struct {
|
|||
|
||||
type MerchState struct {
|
||||
KeyPair KeyPair `json:"keypair"`
|
||||
InitBalance int `json:"init_balance"`
|
||||
NizkParams interface{} `json:"nizkParams"`
|
||||
Pk string `json:"pk"`
|
||||
Sk string `json:"sk"`
|
||||
ComParams ComParams `json:"comParams"`
|
||||
|
@ -151,20 +151,20 @@ func BidirectionalChannelSetup(name string, channelSupport bool) (string, error)
|
|||
return r.ChannelState, nil
|
||||
}
|
||||
|
||||
func BidirectionalInitMerchant(channelState string, balanceMerchant int, nameMerchant string) (ChannelToken, MerchState, error) {
|
||||
func BidirectionalInitMerchant(channelState string, balanceMerchant int, nameMerchant string) (ChannelToken, MerchState, string, error) {
|
||||
resp := C.GoString(C.ffishim_bidirectional_init_merchant(C.CString(channelState), C.int(balanceMerchant), C.CString(nameMerchant)))
|
||||
r, err := processCResponse(resp)
|
||||
if err != nil {
|
||||
return ChannelToken{}, MerchState{}, err
|
||||
return ChannelToken{}, MerchState{}, "", err
|
||||
}
|
||||
merchState := MerchState{}
|
||||
err = json.Unmarshal([]byte(r.MerchState), &merchState)
|
||||
if err != nil {
|
||||
return ChannelToken{}, MerchState{}, err
|
||||
return ChannelToken{}, MerchState{}, "", err
|
||||
}
|
||||
channelToken := ChannelToken{}
|
||||
err = json.Unmarshal([]byte(r.ChannelToken), &channelToken)
|
||||
return channelToken, merchState, err
|
||||
return channelToken, merchState, r.ChannelState, err
|
||||
}
|
||||
|
||||
func BidirectionalInitCustomer(channelState string, channelToken ChannelToken, balanceCustomer int, balanceMerchant int, nameCustomer string) (ChannelToken, CustState, error) {
|
||||
|
|
|
@ -19,7 +19,7 @@ func setup(b0Cust int, b0Merch int) (string, ChannelToken, MerchState, CustState
|
|||
if err != nil {
|
||||
return "", ChannelToken{}, MerchState{}, CustState{}, err
|
||||
}
|
||||
channelToken, merchState, err := BidirectionalInitMerchant(channelState, b0Merch, "Bob")
|
||||
channelToken, merchState, channelState, err := BidirectionalInitMerchant(channelState, b0Merch, "Bob")
|
||||
if err != nil {
|
||||
return "", ChannelToken{}, MerchState{}, CustState{}, err
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue