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