Fixed log level issues, replaced use of fmt.Printf where appropriate (#361)

* Fixed log level issues, replaced use of fmt.Printf where appropriate

* Additional logging fixes

Author: gertjaap

btcutil/txscript/opcode.go

@@ -12,9 +12,9 @@ import (
 	"fmt"
 	"hash"
 
-	"github.com/mit-dci/lit/crypto/koblitz"
 	"github.com/mit-dci/lit/btcutil/chaincfg/chainhash"
 	"github.com/mit-dci/lit/crypto/fastsha256"
+	"github.com/mit-dci/lit/crypto/koblitz"
 	"github.com/mit-dci/lit/crypto/ripemd160"
 	"github.com/mit-dci/lit/wire"
 )

btcutil/txscript/script.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/mit-dci/lit/btcutil/chaincfg/chainhash"
+	"github.com/mit-dci/lit/logging"
 	"github.com/mit-dci/lit/wire"
 )
 
@@ -418,7 +419,7 @@ func CalcWitnessSignatureHash(subScript []parsedOpcode, sigHashes *TxSigHashes,
 	// As a sanity check, ensure the passed input index for the transaction
 	// is valid.
 	if idx > len(tx.TxIn)-1 {
-		fmt.Printf("calcWitnessSignatureHash error: idx %d but %d txins",
+		logging.Errorf("calcWitnessSignatureHash error: idx %d but %d txins",
 			idx, len(tx.TxIn))
 		return nil
 	}

cmd/lit-af/dlccmds.go

@@ -10,6 +10,7 @@ import (
 	"github.com/fatih/color"
 	"github.com/mit-dci/lit/litrpc"
 	"github.com/mit-dci/lit/lnutil"
+	"github.com/mit-dci/lit/logging"
 )
 
 var dlcCommand = &Command{
@@ -389,7 +390,7 @@ func (lc *litAfClient) DlcListOracles(textArgs []string) error {
 		return err
 	}
 	if len(reply.Oracles) == 0 {
-		fmt.Println("No oracles found")
+		logging.Infof("No oracles found")
 	}
 	for _, o := range reply.Oracles {
 		fmt.Fprintf(color.Output, "%04d: [%x...%x...%x]  %s\n",

cmd/lit-af/walletcmds.go

@@ -7,6 +7,7 @@ import (
 	"github.com/fatih/color"
 	"github.com/mit-dci/lit/litrpc"
 	"github.com/mit-dci/lit/lnutil"
+	"github.com/mit-dci/lit/logging"
 )
 
 var sendCommand = &Command{
@@ -166,7 +167,7 @@ func (lc *litAfClient) Fee(textArgs []string) error {
 	if len(textArgs) > 0 {
 		feeint, err := strconv.Atoi(textArgs[0])
 		if err != nil {
-			fmt.Printf("Can't set fee to %s, querying current fee instead\n", textArgs[0])
+			logging.Errorf("Can't set fee to %s, querying current fee instead\n", textArgs[0])
 		} else {
 			set = true
 			SetArgs.Fee = int64(feeint)

eventbus/bus_test.go

@@ -1,9 +1,10 @@
 package eventbus
 
 import (
-	"fmt"
 	"testing"
 	"time"
+
+	"github.com/mit-dci/lit/logging"
 )
 
 func TestBusSimple(t *testing.T) {
@@ -57,7 +58,7 @@ func TestBusAsync(t *testing.T) {
 	})
 
 	r := <-c
-	fmt.Printf("got result: %d\n", r)
+	logging.Infof("got result: %d\n", r)
 
 }
 

lnutil/dlclib.go

@@ -5,12 +5,13 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
+	"math/big"
+
 	"github.com/mit-dci/lit/btcutil/chaincfg/chainhash"
 	"github.com/mit-dci/lit/consts"
 	"github.com/mit-dci/lit/crypto/koblitz"
 	"github.com/mit-dci/lit/logging"
 	"github.com/mit-dci/lit/wire"
-	"math/big"
 )
 
 // DlcContractStatus is an enumeration containing the various statuses a
@@ -96,14 +97,14 @@ func DlcContractFromBytes(b []byte) (*DlcContract, error) {
 
 	ourIdx, err := wire.ReadVarInt(buf, 0)
 	if err != nil {
-		fmt.Println("Error while deserializing varint for theirIdx")
+		logging.Errorf("Error while deserializing varint for theirIdx: %s", err.Error())
 		return nil, err
 	}
 	c.Idx = ourIdx
 
 	theirIdx, err := wire.ReadVarInt(buf, 0)
 	if err != nil {
-		fmt.Println("Error while deserializing varint for theirIdx")
+		logging.Errorf("Error while deserializing varint for theirIdx: %s", err.Error())
 		return nil, err
 	}
 	c.TheirIdx = theirIdx
@@ -113,14 +114,14 @@ func DlcContractFromBytes(b []byte) (*DlcContract, error) {
 
 	peerIdx, err := wire.ReadVarInt(buf, 0)
 	if err != nil {
-		fmt.Println("Error while deserializing varint for peerIdx")
+		logging.Errorf("Error while deserializing varint for peerIdx: %s", err.Error())
 		return nil, err
 	}
 	c.PeerIdx = uint32(peerIdx)
 
 	coinType, err := wire.ReadVarInt(buf, 0)
 	if err != nil {
-		fmt.Println("Error while deserializing varint for coinType")
+		logging.Errorf("Error while deserializing varint for coinType: %s", err.Error())
 		return nil, err
 	}
 	c.CoinType = uint32(coinType)
@@ -153,7 +154,7 @@ func DlcContractFromBytes(b []byte) (*DlcContract, error) {
 
 	status, err := wire.ReadVarInt(buf, 0)
 	if err != nil {
-		fmt.Println("Error while deserializing varint for status")
+		logging.Errorf("Error while deserializing varint for status: %s", err.Error())
 		return nil, err
 	}
 

nat/upnp.go

@@ -2,7 +2,6 @@ package nat
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/mit-dci/lit/logging"
 
@@ -13,21 +12,18 @@ func SetupUpnp(port uint16) error {
 	// Connect to router
 	deliver, err := UpnP.DiscoverCtx(context.Background())
 	if err != nil {
-		fmt.Printf("Unable to discover router %v\n", err)
-		logging.Fatal(err)
+		logging.Fatalf("Unable to discover router %v\n", err)
 	}
 	// Get external IP
 	ip, err := deliver.ExternalIP()
 	if err != nil {
-		fmt.Printf("Unable to get external ip %v\n", err)
-		logging.Fatal(err)
+		logging.Fatalf("Unable to get external ip %v\n", err)
 	}
 	logging.Infof("Your external IP is %s", ip)
 	// Forward peer port
 	err = deliver.Forward(uint16(port), "lnd peer port")
 	if err != nil {
-		fmt.Printf("UpnP: Unable to forward pear port ip %v\n", err)
-		logging.Fatal(err)
+		logging.Fatalf("UpnP: Unable to forward pear port ip %v\n", err)
 	}
 	return nil
 }

qln/buildtx.go

@@ -200,7 +200,7 @@ func (q *Qchan) BuildStateTxs(mine bool) (*wire.MsgTx, []*wire.MsgTx, []*wire.Tx
 	outFancy := wire.NewTxOut(fancyAmt, fancyScript)
 	outPKH := wire.NewTxOut(pkhAmt, pkhScript)
 
-	fmt.Printf("\tcombined refund %x, pkh %x, amt %d\n", pkhPub, outPKH.PkScript, pkhAmt)
+	logging.Infof("\tcombined refund %x, pkh %x, amt %d\n", pkhPub, outPKH.PkScript, pkhAmt)
 
 	var HTLCTxOuts []*wire.TxOut
 

qln/htlc.go

@@ -196,7 +196,7 @@ func (nd *LitNode) HashSigHandler(msg lnutil.HashSigMsg, qc *Qchan) error {
 		collision = true
 	}
 
-	fmt.Printf("COLLISION is (%t)\n", collision)
+	logging.Infof("COLLISION is (%t)\n", collision)
 
 	// load state from disk
 	err := nd.ReloadQchanState(qc)
@@ -294,7 +294,7 @@ func (nd *LitNode) HashSigHandler(msg lnutil.HashSigMsg, qc *Qchan) error {
 	// update to the next state to verify
 	qc.State.StateIdx++
 
-	fmt.Printf("Got message %x", msg.Data)
+	logging.Infof("Got message %x", msg.Data)
 	qc.State.Data = msg.Data
 
 	// verify sig for the next state. only save if this works
@@ -563,7 +563,7 @@ func (nd *LitNode) PreimageSigHandler(msg lnutil.PreimageSigMsg, qc *Qchan) erro
 		collision = true
 	}
 
-	fmt.Printf("COLLISION is (%t)\n", collision)
+	logging.Infof("COLLISION is (%t)\n", collision)
 
 	// load state from disk
 	err := nd.ReloadQchanState(qc)
@@ -596,7 +596,7 @@ func (nd *LitNode) PreimageSigHandler(msg lnutil.PreimageSigMsg, qc *Qchan) erro
 	}
 
 	if qc.State.Delta > 0 {
-		fmt.Printf(
+		logging.Errorf(
 			"PreimageSigHandler err: chan %d delta %d, expect rev, send empty rev",
 			qc.Idx(), qc.State.Delta)
 
@@ -667,7 +667,7 @@ func (nd *LitNode) PreimageSigHandler(msg lnutil.PreimageSigMsg, qc *Qchan) erro
 	// update to the next state to verify
 	qc.State.StateIdx++
 
-	fmt.Printf("Got message %x", msg.Data)
+	logging.Infof("Got message %x", msg.Data)
 	qc.State.Data = msg.Data
 
 	h := &qc.State.HTLCs[msg.Idx]

qln/msghandler.go

@@ -210,33 +210,33 @@ func (nd *LitNode) ChannelHandler(msg lnutil.LitMsg, peer *RemotePeer) error {
 func (nd *LitNode) DualFundingHandler(msg lnutil.LitMsg, peer *RemotePeer) error {
 	switch message := msg.(type) {
 	case lnutil.DualFundingReqMsg: // DUAL FUNDING REQUEST
-		fmt.Printf("Got dual funding request from %x\n", message.Peer())
+		logging.Infof("Got dual funding request from %x\n", message.Peer())
 		nd.DualFundingReqHandler(message)
 		return nil
 
 	case lnutil.DualFundingAcceptMsg: // DUAL FUNDING ACCEPT
-		fmt.Printf("Got dual funding acceptance from %x\n", msg.Peer())
+		logging.Infof("Got dual funding acceptance from %x\n", msg.Peer())
 		nd.DualFundingAcceptHandler(message)
 		return nil
 
 	case lnutil.DualFundingDeclMsg: // DUAL FUNDING DECLINE
-		fmt.Printf("Got dual funding decline from %x\n", msg.Peer())
+		logging.Infof("Got dual funding decline from %x\n", msg.Peer())
 		nd.DualFundingDeclHandler(message)
 		return nil
 
 	case lnutil.ChanDescMsg: // CHANNEL DESCRIPTION
-		fmt.Printf("Got (dual funding) channel description from %x\n", msg.Peer())
+		logging.Infof("Got (dual funding) channel description from %x\n", msg.Peer())
 		nd.DualFundChanDescHandler(message)
 		return nil
 
 	case lnutil.DualFundingChanAckMsg: // CHANNEL ACKNOWLEDGE
-		fmt.Printf("Got (dual funding) channel acknowledgement from %x\n", msg.Peer())
+		logging.Infof("Got (dual funding) channel acknowledgement from %x\n", msg.Peer())
 
 		nd.DualFundChanAckHandler(message, peer)
 		return nil
 
 	case lnutil.SigProofMsg: // HERE'S YOUR CHANNEL
-		fmt.Printf("Got (dual funding) channel proof from %x\n", msg.Peer())
+		logging.Infof("Got (dual funding) channel proof from %x\n", msg.Peer())
 		nd.DualFundSigProofHandler(message, peer)
 		return nil
 

qln/signtx.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/mit-dci/lit/crypto/koblitz"
 	"github.com/mit-dci/lit/btcutil/txscript"
+	"github.com/mit-dci/lit/crypto/koblitz"
 	"github.com/mit-dci/lit/lnutil"
 	"github.com/mit-dci/lit/logging"
 	"github.com/mit-dci/lit/sig64"
@@ -205,10 +205,10 @@ func (nd *LitNode) SignState(q *Qchan) ([64]byte, [][64]byte, error) {
 		return sig, nil, err
 	}
 
-	fmt.Printf("____ sig creation for channel (%d,%d):\n", q.Peer(), q.Idx())
-	fmt.Printf("\tinput %s\n", commitmentTx.TxIn[0].PreviousOutPoint.String())
+	logging.Infof("____ sig creation for channel (%d,%d):\n", q.Peer(), q.Idx())
+	logging.Infof("\tinput %s\n", commitmentTx.TxIn[0].PreviousOutPoint.String())
 	for i, txout := range commitmentTx.TxOut {
-		fmt.Printf("\toutput %d: %x %d\n", i, txout.PkScript, txout.Value)
+		logging.Infof("\toutput %d: %x %d\n", i, txout.PkScript, txout.Value)
 	}
 
 	logging.Infof("\tstate %d myamt: %d theiramt: %d\n", q.State.StateIdx, q.State.MyAmt, q.Value-q.State.MyAmt)
@@ -354,10 +354,10 @@ func (q *Qchan) VerifySigs(sig [64]byte, HTLCSigs [][64]byte) error {
 	if err != nil {
 		return err
 	}
-	fmt.Printf("____ sig verification for channel (%d,%d):\n", q.Peer(), q.Idx())
-	fmt.Printf("\tinput %s\n", commitmentTx.TxIn[0].PreviousOutPoint.String())
+	logging.Infof("____ sig verification for channel (%d,%d):\n", q.Peer(), q.Idx())
+	logging.Infof("\tinput %s\n", commitmentTx.TxIn[0].PreviousOutPoint.String())
 	for i, txout := range commitmentTx.TxOut {
-		fmt.Printf("\toutput %d: %x %d\n", i, txout.PkScript, txout.Value)
+		logging.Infof("\toutput %d: %x %d\n", i, txout.PkScript, txout.Value)
 	}
 	logging.Infof("\tstate %d myamt: %d theiramt: %d\n", q.State.StateIdx, q.State.MyAmt, q.Value-q.State.MyAmt)
 	logging.Infof("\tsig: %x\n", sig)

uspv/eight333.go

@@ -373,7 +373,7 @@ func (s *SPVCon) AskForBlocks() error {
 		return nil
 	}
 
-	logging.Errorf("will request blocks %d to %d\n", s.syncHeight+1, headerTip)
+	logging.Debugf("will request blocks %d to %d\n", s.syncHeight+1, headerTip)
 	reqHeight := s.syncHeight
 
 	// loop through all heights where we want merkleblocks.