chore(All): Remove unnecessary logging.

feat(funder): Add egoistic funding.
perun-network · Jul 17, 2024 · 1d4a9f7 · 1d4a9f7
1 parent a9bb3d1
commit 1d4a9f7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 24 deletions.
diff --git a/channel/backend.go b/channel/backend.go
@@ -44,7 +44,6 @@ func (b backend) CalcID(params *channel.Params) channel.ID {
 		return channel.ID{}
 	}
 	id := sha256.Sum256(bytes)
-	log.Println("CalcID called:", id)
 	return id
 }
 

diff --git a/channel/funder.go b/channel/funder.go
@@ -151,7 +151,7 @@ func (f *Funder) fundParty(ctx context.Context, req pchannel.FundingReq) error {
 				log.Println("Balance A: ", bal0, bal1, " after funding amount: ", req.State.Balances, req.State.Assets)
 				continue
 			}
-			if req.Idx == pchannel.Index(1) && !chanState.Control.FundedB {
+			if req.Idx == pchannel.Index(1) && !chanState.Control.FundedB && chanState.Control.FundedA {
 				log.Println("Funding party B")
 				err := f.FundChannel(ctx, req.State, true)
 				if err != nil {
@@ -195,8 +195,7 @@ func (f *Funder) openChannel(ctx context.Context, req pchannel.FundingReq) error
 		log.Println(err)
 		return errors.New("error while opening channel in party A")
 	}
-	ch, err := f.cb.GetChannelInfo(ctx, f.perunAddr, req.State.ID)
-	log.Println("Channel: ", ch)
+	_, err = f.cb.GetChannelInfo(ctx, f.perunAddr, req.State.ID)
 	return nil
 }
 
@@ -208,10 +207,8 @@ func (f *Funder) FundChannel(ctx context.Context, state *pchannel.State, funderI
 	}
 
 	if !containsAllAssets(balsStellar.Tokens, f.assetAddrs) {
-		log.Println(balsStellar.Tokens, f.assetAddrs)
 		return errors.New("asset address is not equal to the address stored in the state")
 	}
-	log.Println(f.perunAddr, state.ID, funderIdx)
 	return f.cb.Fund(ctx, f.perunAddr, state.ID, funderIdx)
 }
 

diff --git a/client/client.go b/client/client.go
@@ -252,7 +252,7 @@ func (cb *ContractBackend) Withdraw(ctx context.Context, perunAddr xdr.ScAddress
 		log.Println("Error while getting balance: ", err)
 	}
 	tokenAddr1 := req.Tx.State.Assets[1].(*types.StellarAsset)
-	log.Println("Asset1: ", tokenAddr1, "Asset2: ", tokenAddr0)
+
 	cAdd1, err := types.MakeContractAddress(tokenAddr1.ContractID())
 	if err != nil {
 		return err

diff --git a/client/transaction.go b/client/transaction.go
@@ -9,7 +9,6 @@ import (
 	"github.com/stellar/go/protocols/horizon"
 	"github.com/stellar/go/txnbuild"
 	"github.com/stellar/go/xdr"
-	"log"
 	"math/big"
 	"perun.network/perun-stellar-backend/wire"
 	"time"
@@ -128,7 +127,6 @@ func PreflightHostFunctionsResult(hzClient *horizonclient.Client,
 	if err != nil {
 		return wire.Channel{}, "", function, result.MinResourceFee, err
 	}
-	log.Println("RESULT: ", decodedXdr)
 	if chInfo {
 		decChanInfo := decodedXdr
 

diff --git a/client/transactor.go b/client/transactor.go
@@ -5,7 +5,6 @@ import (
 	"github.com/stellar/go/keypair"
 	"github.com/stellar/go/txnbuild"
 	"github.com/stellar/go/xdr"
-	"log"
 )
 
 func CreateSignedTransactionWithParams(signers []*keypair.Full, txParams txnbuild.TransactionParams,
@@ -35,13 +34,6 @@ func NewSender(kp *keypair.Full) Sender {
 }
 
 func (s *TxSender) SignSendTx(txUnsigned txnbuild.Transaction) (xdr.TransactionMeta, error) {
-	accReq := horizonclient.AccountRequest{AccountID: s.kp.Address()}
-	acc, err := s.hzClient.AccountDetail(accReq)
-	if err != nil {
-		return xdr.TransactionMeta{}, err
-	}
-	bals := acc.Balances
-	log.Println("Balances: ", bals)
 	tx, err := txUnsigned.Sign(NETWORK_PASSPHRASE, s.kp)
 	if err != nil {
 		return xdr.TransactionMeta{}, err
@@ -57,13 +49,7 @@ func (s *TxSender) SignSendTx(txUnsigned txnbuild.Transaction) (xdr.TransactionM
 		return xdr.TransactionMeta{}, ErrCouldNotDecodeTxMeta
 	}
 	_ = txMeta.V3.SorobanMeta.ReturnValue
-	accReq = horizonclient.AccountRequest{AccountID: s.kp.Address()}
-	acc, err = s.hzClient.AccountDetail(accReq)
-	if err != nil {
-		return xdr.TransactionMeta{}, err
-	}
-	bals = acc.Balances
-	log.Println("Balances: ", bals)
+
 	return txMeta, nil
 
 }