From 2b2a3714c16791aaf7626fdfcda50331657e319d Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Tue, 22 Aug 2017 01:00:07 -0700
Subject: [PATCH] multi: fix linter errors

---
 discovery/service.go  | 2 +-
 lnwire/lnwire.go      | 2 +-
 lnwire/onion_error.go | 8 ++++----
 rpcserver.go          | 4 +++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/discovery/service.go b/discovery/service.go
index 5cfdd86f..f03927b6 100644
--- a/discovery/service.go
+++ b/discovery/service.go
@@ -722,7 +722,7 @@ func (d *AuthenticatedGossiper) processNetworkAnnouncement(nMsg *networkMsg) []l
 		// within the database for our path finding and syncing needs.
 		var featureBuf bytes.Buffer
 		if err := msg.Features.Encode(&featureBuf); err != nil {
-			log.Error("unable to encode features: %v", err)
+			log.Errorf("unable to encode features: %v", err)
 			nMsg.err <- err
 			return nil
 		}
diff --git a/lnwire/lnwire.go b/lnwire/lnwire.go
index 9bf2ce4e..8cf8b07c 100644
--- a/lnwire/lnwire.go
+++ b/lnwire/lnwire.go
@@ -87,7 +87,7 @@ func writeElement(w io.Writer, element interface{}) error {
 		}
 	case *btcec.PublicKey:
 		if e == nil {
-			fmt.Errorf("cannot write nil pubkey")
+			return fmt.Errorf("cannot write nil pubkey")
 		}
 
 		var b [33]byte
diff --git a/lnwire/onion_error.go b/lnwire/onion_error.go
index c6412bfd..9b4bc61b 100644
--- a/lnwire/onion_error.go
+++ b/lnwire/onion_error.go
@@ -834,8 +834,8 @@ func DecodeFailure(r io.Reader, pver uint32) (FailureMessage, error) {
 		return nil, err
 	}
 	if failureLength > failureMessageLength {
-		return nil, errors.New(fmt.Sprintf("failure message is too "+
-			"long: %v", failureLength))
+		return nil, fmt.Errorf("failure message is too "+
+			"long: %v", failureLength)
 	}
 	failureData := make([]byte, failureLength)
 	if _, err := io.ReadFull(r, failureData); err != nil {
@@ -900,8 +900,8 @@ func EncodeFailure(w io.Writer, failure FailureMessage, pver uint32) error {
 	// failure message length.
 	failureMessage := failureMessageBuffer.Bytes()
 	if len(failureMessage) > failureMessageLength {
-		return errors.New(fmt.Sprintf("failure message exceed max "+
-			"available size: %v", len(failureMessage)))
+		return fmt.Errorf("failure message exceed max "+
+			"available size: %v", len(failureMessage))
 	}
 
 	// Finally, we'll add some padding in order to ensure that all failure
diff --git a/rpcserver.go b/rpcserver.go
index 8d725e1d..cb879c4f 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -2771,7 +2771,9 @@ func (r *rpcServer) FeeReport(ctx context.Context,
 		return nil, err
 	}
 
-	return &lnrpc.FeeReportResponse{feeReports}, nil
+	return &lnrpc.FeeReportResponse{
+		ChannelFees: feeReports,
+	}, nil
 }
 
 // minFeeRate is the smallest permitted fee rate within the network. This is