Remove debugging logs

bindings/fileTransfer.go

@@ -201,7 +201,6 @@ func (f *FileTransfer) Send(payload, recipientID []byte, retry float32,
 		base64.StdEncoding.EncodeToString(recipientID))
 
 	// Unmarshal recipient ID
-	jww.INFO.Printf("** FileTransfer.Send before id.Unmarshal")
 	recipient, err := id.Unmarshal(recipientID)
 	if err != nil {
 		return nil, err
@@ -209,7 +208,6 @@ func (f *FileTransfer) Send(payload, recipientID []byte, retry float32,
 
 	p := time.Millisecond * time.Duration(period)
 
-	jww.INFO.Printf("** FileTransfer.Send before building CB")
 	// Wrap transfer progress callback to be passed to fileTransfer layer
 	cb := func(completed bool, arrived, total uint16,
 		st fileTransfer.SentTransfer, t fileTransfer.FilePartTracker, err error) {
@@ -228,14 +226,12 @@ func (f *FileTransfer) Send(payload, recipientID []byte, retry float32,
 	}
 
 	// Unmarshal payload
-	jww.INFO.Printf("** FileTransfer.Send before unmarshal FileSend")
 	var fs FileSend
 	if err = json.Unmarshal(payload, &fs); err != nil {
 		return nil, err
 	}
 
 	// Send file
-	jww.INFO.Printf("** FileTransfer.Send before send")
 	ftID, err := f.w.Send(
 		recipient, fs.Name, fs.Type, fs.Contents, retry, fs.Preview, cb, p)
 	if err != nil {
@@ -243,7 +239,6 @@ func (f *FileTransfer) Send(payload, recipientID []byte, retry float32,
 	}
 
 	// Return Transfer ID
-	jww.INFO.Printf("** FileTransfer.Send before return")
 	return ftID.Bytes(), nil
 }
 

e2e/receive/switchboard.go

@@ -64,15 +64,11 @@ func (sw *Switchboard) RegisterListener(user *id.ID,
 	}
 
 	//register the listener by both ID and messageType
-	jww.INFO.Printf("** Before Mux")
 	sw.mux.Lock()
 
-	jww.INFO.Printf("** Before ID Add")
 	sw.id.Add(lid)
-	jww.INFO.Printf("** Before messageType Add")
 	sw.messageType.Add(lid)
 
-	jww.INFO.Printf("** Before Mux unlock")
 	sw.mux.Unlock()
 
 	//return a ListenerID so it can be unregistered in the future

fileTransfer/e2e/wrapper.go

@@ -8,7 +8,6 @@
 package e2e
 
 import (
-	jww "github.com/spf13/jwalterweatherman"
 	"gitlab.com/elixxir/client/catalog"
 	"gitlab.com/elixxir/client/e2e"
 	"gitlab.com/elixxir/client/e2e/receive"
@@ -91,15 +90,12 @@ func (w *Wrapper) Send(recipient *id.ID, fileName, fileType string,
 	progressCB ft.SentProgressCallback, period time.Duration) (
 	*ftCrypto.TransferID, error) {
 
-	jww.INFO.Printf("** Wrapper.Send before SendNew creation")
 	sendNew := func(transferInfo []byte) error {
 		return sendNewFileTransferMessage(recipient, transferInfo, w.e2e)
 	}
 
-	jww.INFO.Printf("** Wrapper.Send before addEndMessageToCallback")
 	modifiedProgressCB := w.addEndMessageToCallback(progressCB)
 
-	jww.INFO.Printf("** Wrapper.Send before send")
 	return w.ft.Send(recipient, fileName, fileType, fileData, retry, preview,
 		modifiedProgressCB, period, sendNew)
 }
@@ -119,13 +115,10 @@ func (w *Wrapper) RegisterSentProgressCallback(tid *ftCrypto.TransferID,
 // message is not sent.
 func (w *Wrapper) addEndMessageToCallback(
 	progressCB ft.SentProgressCallback) ft.SentProgressCallback {
-	jww.INFO.Printf("** Wrapper.addEndMessageToCallback before !w.p.NotifyUponCompletion")
 	if !w.p.NotifyUponCompletion {
-		jww.INFO.Printf("** Wrapper.addEndMessageToCallback after !w.p.NotifyUponCompletion")
 		return progressCB
 	}
 
-	jww.INFO.Printf("** Wrapper.addEndMessageToCallback before return")
 	return func(completed bool, arrived, total uint16,
 		st ft.SentTransfer, t ft.FilePartTracker, err error) {
 

fileTransfer/manager.go

@@ -270,10 +270,6 @@ func (m *manager) Send(recipient *id.ID, fileName, fileType string,
 	progressCB SentProgressCallback, period time.Duration, sendNew SendNew) (
 	*ftCrypto.TransferID, error) {
 
-	jww.INFO.Printf(
-		"** Sending file transfer %q to %s. fileType:%s retry:%f preview:%q",
-		fileName, recipient, fileType, retry, preview)
-
 	// Return an error if the file name is too long
 	if len(fileName) > FileNameMaxLen {
 		return nil, errors.Errorf(errFileNameSize, len(fileName), FileNameMaxLen)
@@ -295,21 +291,17 @@ func (m *manager) Send(recipient *id.ID, fileName, fileType string,
 	}
 
 	// Return an error if the network is not healthy
-	jww.INFO.Printf("** manager.Send before IsHealthy")
 	if !m.cmix.IsHealthy() {
 		return nil, errors.Errorf(errSendNetworkHealth, fileName)
 	}
 
 	// Generate new transfer key and transfer ID
-	jww.INFO.Printf("** manager.Send before GetStream")
 	rng := m.rng.GetStream()
-	jww.INFO.Printf("** manager.Send before NewTransferKey")
 	key, err := ftCrypto.NewTransferKey(rng)
 	if err != nil {
 		rng.Close()
 		return nil, errors.Errorf(errNewKey, err)
 	}
-	jww.INFO.Printf("** manager.Send before NewTransferID")
 	tid, err := ftCrypto.NewTransferID(rng)
 	if err != nil {
 		rng.Close()
@@ -318,18 +310,15 @@ func (m *manager) Send(recipient *id.ID, fileName, fileType string,
 	rng.Close()
 
 	// Generate transfer MAC
-	jww.INFO.Printf("** manager.Send before CreateTransferMAC")
 	mac := ftCrypto.CreateTransferMAC(fileData, key)
 
 	// Get size of each part and partition file into equal length parts
-	jww.INFO.Printf("** manager.Send before NewPartMessage")
 	partMessage := fileMessage.NewPartMessage(m.cmix.GetMaxMessageLength())
 	parts := partitionFile(fileData, partMessage.GetPartSize())
 	numParts := uint16(len(parts))
 	fileSize := uint32(len(fileData))
 
 	// Send the initial file transfer message over E2E
-	jww.INFO.Printf("** manager.Send before TransferInfo")
 	info := &TransferInfo{
 		fileName, fileType, key, mac, numParts, fileSize, retry, preview}
 	transferInfo, err := info.Marshal()
@@ -345,7 +334,6 @@ func (m *manager) Send(recipient *id.ID, fileName, fileType string,
 	}
 
 	// Calculate the number of fingerprints to generate
-	jww.INFO.Printf("** manager.Send before calcNumberOfFingerprints")
 	numFps := calcNumberOfFingerprints(len(parts), retry)
 
 	// Create new sent transfer
@@ -367,11 +355,9 @@ func (m *manager) Send(recipient *id.ID, fileName, fileType string,
 	for _, p := range st.GetUnsentParts() {
 		m.batchQueue <- p
 	}
-	jww.INFO.Printf("** manager.Send before registerSentProgressCallback")
 
 	// Register the progress callback
 	m.registerSentProgressCallback(st, progressCB, period)
-	jww.INFO.Printf("** manager.Send before return")
 
 	return &tid, nil
 }

xxdk/cmix.go

@@ -414,7 +414,6 @@ func (c *Cmix) GetRoundEvents() interfaces.RoundEvents {
 // AddService adds a service to be controlled by the client thread control.
 // These will be started and stopped with the network follower.
 func (c *Cmix) AddService(sp Service) error {
-	jww.INFO.Printf("** Before followerServices.add")
 	return c.followerServices.add(sp)
 }
 

xxdk/services.go

@@ -9,7 +9,6 @@ package xxdk
 
 import (
 	"github.com/pkg/errors"
-	jww "github.com/spf13/jwalterweatherman"
 	"gitlab.com/elixxir/client/stoppable"
 	"sync"
 	"time"
@@ -39,23 +38,18 @@ func newServices() *services {
 // add appends the service process to the list and adds it to the multi-
 // stoppable. Start running it if services are running.
 func (s *services) add(sp Service) error {
-	jww.INFO.Printf("** Before services.mux.Lock")
 	s.mux.Lock()
 	defer s.mux.Unlock()
 
 	// append the process to the list
-	jww.INFO.Printf("** Before services append")
 	s.services = append(s.services, sp)
 
 	// if services are running, start the process
-	jww.INFO.Printf("** Before s.state == Running")
 	if s.state == Running {
-		jww.INFO.Printf("** Call service")
 		stop, err := sp()
 		if err != nil {
 			return errors.WithMessage(err, "Failed to start added service")
 		}
-		jww.INFO.Printf("** Call stoppable Add")
 		s.stoppable.Add(stop)
 	}
 	return nil