From e70a42194d75c22ac0990a180b49174e97301c26 Mon Sep 17 00:00:00 2001
From: Gijs Van Laer <gijs.vanlaer@gmail.com>
Date: Wed, 11 Sep 2019 11:11:46 -0400
Subject: [PATCH] nizk: fix gotests

---
 go/libbolt.go      | 22 +++++++++++-----------
 go/libbolt_test.go |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/go/libbolt.go b/go/libbolt.go
index eb9ca41..b8cebcb 100644
--- a/go/libbolt.go
+++ b/go/libbolt.go
@@ -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) {
diff --git a/go/libbolt_test.go b/go/libbolt_test.go
index ed44a6e..e93687c 100644
--- a/go/libbolt_test.go
+++ b/go/libbolt_test.go
@@ -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
 	}