Merge pull request #13 from perun-network:refactor-client-mutex

Remove global mutex from client package, in favor of a mutex in the Client struct.

client/client.go

@@ -21,9 +21,9 @@ import (
 	"github.com/stellar/go/keypair"
 	"github.com/stellar/go/xdr"
 	"log"
-
 	pchannel "perun.network/go-perun/channel"
 	pwallet "perun.network/go-perun/wallet"
+	"sync"
 
 	"perun.network/perun-stellar-backend/event"
 	"perun.network/perun-stellar-backend/wire"
@@ -36,6 +36,7 @@ var ErrCouldNotDecodeTxMeta = errors.New("could not decode tx output")
 type Client struct {
 	hzClient  *horizonclient.Client
 	keyHolder keyHolder
+	mtx       sync.Mutex
 }
 type keyHolder struct {
 	kp *keypair.Full
@@ -45,6 +46,7 @@ func New(kp *keypair.Full) *Client {
 	return &Client{
 		hzClient:  NewHorizonClient(),
 		keyHolder: newKeyHolder(kp),
+		mtx:       sync.Mutex{},
 	}
 }
 

client/transaction.go

@@ -10,12 +10,9 @@ import (
 	"github.com/stellar/go/txnbuild"
 	"github.com/stellar/go/xdr"
 	"strconv"
-	"sync"
 	"time"
 )
 
-var sharedMtx sync.Mutex
-
 const sorobanRPCPort = 8000
 
 func (s *Client) CreateSignedTxFromParams(txParams txnbuild.TransactionParams) (*txnbuild.Transaction, error) {
@@ -50,8 +47,8 @@ func CreateSignedTransactionWithParams(signers []*keypair.Full, txParams txnbuil
 }
 
 func (c *Client) InvokeAndProcessHostFunction(fname string, callTxArgs xdr.ScVec, contractAddr xdr.ScAddress) (xdr.TransactionMeta, error) {
-	sharedMtx.Lock()
-	defer sharedMtx.Unlock()
+	c.mtx.Lock()
+	defer c.mtx.Unlock()
 	fnameXdr := xdr.ScSymbol(fname)
 	hzAcc, err := c.GetHorizonAccount()
 	if err != nil {