zecfoundation
/
libbolt
mirror of https://github.com/ZcashFoundation/libbolt.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nizk: fix gotests

This commit is contained in:
Gijs Van Laer 2019-09-11 11:11:46 -04:00
parent f25ee986b9
commit e70a42194d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
go/libbolt.go
View File

@ -31,13 +31,13 @@ type setupResp struct {
}
type MerchState struct {
KeyPair KeyPair `json:"keypair"`
InitBalance int `json:"init_balance"`
Pk string `json:"pk"`
Sk string `json:"sk"`
ComParams ComParams `json:"comParams"`
Keys interface{} `json:"keys"`
PayTokens interface{} `json:"pay_tokens"`
KeyPair KeyPair `json:"keypair"`
NizkParams interface{} `json:"nizkParams"`
Pk string `json:"pk"`
Sk string `json:"sk"`
ComParams ComParams `json:"comParams"`
Keys interface{} `json:"keys"`
PayTokens interface{} `json:"pay_tokens"`
}
type CustState struct {
@ -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) {

2
go/libbolt_test.go
View File

@ -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
}