goimports and govet fixes

yacovm · yacovm · commit ec26cd86e101 · 2016-10-23T14:38:26.000+03:00
Change-Id: Ia0dcd58b57be91f6dcd1117de7f903ed57922065
Signed-off-by: Yacov Manevich &lt;yacovm@il.ibm.com&gt;
diff --git a/consensus/executor/executor.go b/consensus/executor/executor.go
@@ -21,7 +21,6 @@ import (
 	"github.com/hyperledger/fabric/consensus/util/events"
 	"github.com/hyperledger/fabric/core/peer/statetransfer"
 	pb "github.com/hyperledger/fabric/protos"
-
 	"github.com/op/go-logging"
 )
 
diff --git a/consensus/executor/executor_test.go b/consensus/executor/executor_test.go
@@ -22,10 +22,9 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric/consensus/util/events"
+	"github.com/op/go-logging"
 
 	pb "github.com/hyperledger/fabric/protos"
-
-	"github.com/op/go-logging"
 )
 
 func init() {
diff --git a/consensus/pbft/batch.go b/consensus/pbft/batch.go
@@ -23,10 +23,10 @@ import (
 	"github.com/hyperledger/fabric/consensus"
 	"github.com/hyperledger/fabric/consensus/util/events"
 	pb "github.com/hyperledger/fabric/protos"
+	"github.com/op/go-logging"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes/timestamp"
-	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 )
 
diff --git a/consensus/util/messagefan.go b/consensus/util/messagefan.go
@@ -19,9 +19,8 @@ package util
 import (
 	"sync"
 
-	"github.com/op/go-logging"
-
 	pb "github.com/hyperledger/fabric/protos"
+	"github.com/op/go-logging"
 )
 
 var logger *logging.Logger // package-level logger
diff --git a/core/committer/noopssinglechain/committer.go b/core/committer/noopssinglechain/committer.go
@@ -146,7 +146,7 @@ func (r *deliverClient) readUntilClose() {
 			if err = r.commit(txs); err != nil {
 				fmt.Printf("Got error while committing(%s)\n", err)
 			} else {
-				fmt.Printf("Commit success, created a block!\n", err)
+				fmt.Printf("Commit success, created a block!\n")
 			}
 
 			r.unAcknowledged++
diff --git a/core/ledger/test/ledger_suite_test.go b/core/ledger/test/ledger_suite_test.go
@@ -22,10 +22,10 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/op/go-logging"
 
 	"github.com/hyperledger/fabric/core/db"
 	"github.com/hyperledger/fabric/core/ledger"
-	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 )
 
diff --git a/core/peer/statetransfer/statetransfer.go b/core/peer/statetransfer/statetransfer.go
@@ -24,11 +24,11 @@ import (
 	"time"
 
 	_ "github.com/hyperledger/fabric/core" // Logging format init
+	"github.com/op/go-logging"
 
 	"github.com/hyperledger/fabric/core/ledger/statemgmt"
 	"github.com/hyperledger/fabric/core/peer"
 	pb "github.com/hyperledger/fabric/protos"
-	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 )
 
diff --git a/core/peer/statetransfer/statetransfer_test.go b/core/peer/statetransfer/statetransfer_test.go
@@ -28,7 +28,6 @@ import (
 	configSetup "github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/protos"
-
 	"github.com/op/go-logging"
 )
 
diff --git a/membersrvc/ca/ecap.go b/membersrvc/ca/ecap.go
@@ -29,12 +29,12 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/core/crypto/primitives/ecies"
+	"github.com/op/go-logging"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/hyperledger/fabric/core/crypto/primitives"
 	pb "github.com/hyperledger/fabric/membersrvc/protos"
-	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 	"golang.org/x/net/context"
 )
diff --git a/orderer/sample_clients/broadcast_timestamp/client.go b/orderer/sample_clients/broadcast_timestamp/client.go
@@ -36,7 +36,7 @@ func newBroadcastClient(client ab.AtomicBroadcast_BroadcastClient) *broadcastCli
 }
 
 func (s *broadcastClient) broadcast(transaction []byte) error {
-	return s.client.Send(&ab.BroadcastMessage{transaction})
+	return s.client.Send(&ab.BroadcastMessage{Data: transaction})
 }
 
 func main() {
diff --git a/orderer/solo/broadcast.go b/orderer/solo/broadcast.go
@@ -124,17 +124,17 @@ func (b *broadcaster) queueBroadcastMessages(srv ab.AtomicBroadcast_BroadcastSer
 		}
 
 		if msg.Data == nil {
-			err = srv.Send(&ab.BroadcastResponse{ab.Status_BAD_REQUEST})
+			err = srv.Send(&ab.BroadcastResponse{Status: ab.Status_BAD_REQUEST})
 			if err != nil {
 				return err
 			}
 		}
 
 		select {
 		case b.queue <- msg:
-			err = srv.Send(&ab.BroadcastResponse{ab.Status_SUCCESS})
+			err = srv.Send(&ab.BroadcastResponse{Status: ab.Status_SUCCESS})
 		default:
-			err = srv.Send(&ab.BroadcastResponse{ab.Status_SERVICE_UNAVAILABLE})
+			err = srv.Send(&ab.BroadcastResponse{Status: ab.Status_SERVICE_UNAVAILABLE})
 		}
 
 		if err != nil {
diff --git a/orderer/solo/broadcast_test.go b/orderer/solo/broadcast_test.go
@@ -64,14 +64,14 @@ func TestQueueOverflow(t *testing.T) {
 	bs.halt()
 
 	for i := 0; i < 2; i++ {
-		m.recvChan <- &ab.BroadcastMessage{[]byte("Some bytes")}
+		m.recvChan <- &ab.BroadcastMessage{Data: []byte("Some bytes")}
 		reply := <-m.sendChan
 		if reply.Status != ab.Status_SUCCESS {
 			t.Fatalf("Should have successfully queued the message")
 		}
 	}
 
-	m.recvChan <- &ab.BroadcastMessage{[]byte("Some bytes")}
+	m.recvChan <- &ab.BroadcastMessage{Data: []byte("Some bytes")}
 	reply := <-m.sendChan
 	if reply.Status != ab.Status_SERVICE_UNAVAILABLE {
 		t.Fatalf("Should not have successfully queued the message")
@@ -92,7 +92,7 @@ func TestMultiQueueOverflow(t *testing.T) {
 
 	for _, m := range ms {
 		for i := 0; i < 2; i++ {
-			m.recvChan <- &ab.BroadcastMessage{[]byte("Some bytes")}
+			m.recvChan <- &ab.BroadcastMessage{Data: []byte("Some bytes")}
 			reply := <-m.sendChan
 			if reply.Status != ab.Status_SUCCESS {
 				t.Fatalf("Should have successfully queued the message")
@@ -101,7 +101,7 @@ func TestMultiQueueOverflow(t *testing.T) {
 	}
 
 	for _, m := range ms {
-		m.recvChan <- &ab.BroadcastMessage{[]byte("Some bytes")}
+		m.recvChan <- &ab.BroadcastMessage{Data: []byte("Some bytes")}
 		reply := <-m.sendChan
 		if reply.Status != ab.Status_SERVICE_UNAVAILABLE {
 			t.Fatalf("Should not have successfully queued the message")
@@ -137,7 +137,7 @@ func TestFilledBatch(t *testing.T) {
 	defer bs.halt()
 	messages := 11 // Sending 11 messages, with a batch size of 2, ensures the 10th message is processed before we proceed for 5 blocks
 	for i := 0; i < messages; i++ {
-		bs.sendChan <- &ab.BroadcastMessage{[]byte("Some bytes")}
+		bs.sendChan <- &ab.BroadcastMessage{Data: []byte("Some bytes")}
 	}
 	expected := uint64(1 + messages/batchSize)
 	if bs.rl.(rawledger.Reader).Height() != expected {
diff --git a/peer/chaincode/noopsordererclient.go b/peer/chaincode/noopsordererclient.go
@@ -40,7 +40,7 @@ func newBroadcastClient(client ab.AtomicBroadcast_BroadcastClient) *broadcastCli
 }
 
 func (s *broadcastClient) broadcast(transaction []byte) error {
-	return s.client.Send(&ab.BroadcastMessage{transaction})
+	return s.client.Send(&ab.BroadcastMessage{Data: transaction})
 }
 
 //Send data to solo orderer

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import (`
`21`	`21`	`"github.com/hyperledger/fabric/consensus/util/events"`
`22`	`22`	`"github.com/hyperledger/fabric/core/peer/statetransfer"`
`23`	`23`	`pb "github.com/hyperledger/fabric/protos"`
`24`		`-`
`25`	`24`	`"github.com/op/go-logging"`
`26`	`25`	`)`
`27`	`26`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,9 @@ import (`
`22`	`22`	`"testing"`
`23`	`23`
`24`	`24`	`"github.com/hyperledger/fabric/consensus/util/events"`
	`25`	`+ "github.com/op/go-logging"`
`25`	`26`
`26`	`27`	`pb "github.com/hyperledger/fabric/protos"`
`27`		`-`
`28`		`- "github.com/op/go-logging"`
`29`	`28`	`)`
`30`	`29`
`31`	`30`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,8 @@ package util`
`19`	`19`	`import (`
`20`	`20`	`"sync"`
`21`	`21`
`22`		`- "github.com/op/go-logging"`
`23`		`-`
`24`	`22`	`pb "github.com/hyperledger/fabric/protos"`
	`23`	`+ "github.com/op/go-logging"`
`25`	`24`	`)`
`26`	`25`
`27`	`26`	`var logger *logging.Logger // package-level logger`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ func (r *deliverClient) readUntilClose() {`
`146`	`146`	`if err = r.commit(txs); err != nil {`
`147`	`147`	`fmt.Printf("Got error while committing(%s)\n", err)`
`148`	`148`	`} else {`
`149`		`- fmt.Printf("Commit success, created a block!\n", err)`
	`149`	`+ fmt.Printf("Commit success, created a block!\n")`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`r.unAcknowledged++`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ import (`
`22`	`22`
`23`	`23`	`. "github.com/onsi/ginkgo"`
`24`	`24`	`. "github.com/onsi/gomega"`
	`25`	`+ "github.com/op/go-logging"`
`25`	`26`
`26`	`27`	`"github.com/hyperledger/fabric/core/db"`
`27`	`28`	`"github.com/hyperledger/fabric/core/ledger"`
`28`		`- "github.com/op/go-logging"`
`29`	`29`	`"github.com/spf13/viper"`
`30`	`30`	`)`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ import (`
`28`	`28`	`configSetup "github.com/hyperledger/fabric/core/config"`
`29`	`29`	`"github.com/hyperledger/fabric/core/peer"`
`30`	`30`	`"github.com/hyperledger/fabric/protos"`
`31`		`-`
`32`	`31`	`"github.com/op/go-logging"`
`33`	`32`	`)`
`34`	`33`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func newBroadcastClient(client ab.AtomicBroadcast_BroadcastClient) *broadcastCli`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func (s *broadcastClient) broadcast(transaction []byte) error {`
`39`		`- return s.client.Send(&ab.BroadcastMessage{transaction})`
	`39`	`+ return s.client.Send(&ab.BroadcastMessage{Data: transaction})`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func main() {`