Move ab Status codes to common

In order to have consistent error reporting across the fabric, it has
been decided to use standard HTTP status codes.  These were defined in
the orderer ab.proto, but have wider applicability.

This changeset removes the Status message from ab.proto and moves it to
common.proto.

Change-Id: I511bcdd0442e9b06daba678763c87f32478377f4
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

core/committer/noopssinglechain/committer.go

@@ -27,6 +27,7 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/committer"
 	"github.com/hyperledger/fabric/core/ledger/kvledger"
+	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	putils "github.com/hyperledger/fabric/protos/utils"
 	"golang.org/x/net/context"
@@ -127,7 +128,7 @@ func (r *deliverClient) readUntilClose() {
 
 		switch t := msg.Type.(type) {
 		case *ab.DeliverResponse_Error:
-			if t.Error == ab.Status_SUCCESS {
+			if t.Error == cb.Status_SUCCESS {
 				fmt.Println("ERROR! Received success in error field")
 				return
 			}

orderer/kafka/broadcast.go

@@ -145,7 +145,7 @@ func (b *broadcasterImpl) recvRequests(stream ab.AtomicBroadcast_BroadcastServer
 		}
 
 		b.batchChan <- msg
-		reply.Status = ab.Status_SUCCESS // TODO This shouldn't always be a success
+		reply.Status = cb.Status_SUCCESS // TODO This shouldn't always be a success
 
 		if err := stream.Send(reply); err != nil {
 			logger.Info("Cannot send broadcast reply to client")

orderer/kafka/broadcast_test.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	cb "github.com/hyperledger/fabric/protos/common"
-	ab "github.com/hyperledger/fabric/protos/orderer"
 )
 
 func TestBroadcastInit(t *testing.T) {
@@ -81,7 +80,7 @@ func TestBroadcastResponse(t *testing.T) {
 	for {
 		select {
 		case reply := <-mbs.outgoing:
-			if reply.Status != ab.Status_SUCCESS {
+			if reply.Status != cb.Status_SUCCESS {
 				t.Fatal("Client should have received a SUCCESS reply")
 			}
 			return

orderer/kafka/client_deliver.go

@@ -105,16 +105,16 @@ func (cd *clientDelivererImpl) sendBlocks(stream ab.AtomicBroadcast_DeliverServe
 				err = cd.processACK(t)
 			}
 			if err != nil {
-				var errorStatus ab.Status
+				var errorStatus cb.Status
 				// TODO Will need to flesh this out into
 				// a proper error handling system eventually.
 				switch err.Error() {
 				case seekOutOfRangeError:
-					errorStatus = ab.Status_NOT_FOUND
+					errorStatus = cb.Status_NOT_FOUND
 				case ackOutOfRangeError, windowOutOfRangeError:
-					errorStatus = ab.Status_BAD_REQUEST
+					errorStatus = cb.Status_BAD_REQUEST
 				default:
-					errorStatus = ab.Status_SERVICE_UNAVAILABLE
+					errorStatus = cb.Status_SERVICE_UNAVAILABLE
 				}
 				reply = new(ab.DeliverResponse)
 				reply.Type = &ab.DeliverResponse_Error{Error: errorStatus}

orderer/main.go

@@ -94,7 +94,7 @@ func retrieveConfiguration(rl rawledger.Reader) *cb.ConfigurationEnvelope {
 		select {
 		case <-it.ReadyChan():
 			block, status := it.Next()
-			if status != ab.Status_SUCCESS {
+			if status != cb.Status_SUCCESS {
 				panic(fmt.Errorf("Error parsing blockchain at startup: %v", status))
 			}
 			// ConfigTxs should always be by themselves

orderer/rawledger/blackbox_test.go

@@ -43,7 +43,7 @@ func getBlock(number uint64, li ReadWriter) *cb.Block {
 	select {
 	case <-i.ReadyChan():
 		block, status := i.Next()
-		if status != ab.Status_SUCCESS {
+		if status != cb.Status_SUCCESS {
 			return nil
 		}
 		return block
@@ -155,7 +155,7 @@ func testRetrieval(lf ledgerFactory, t *testing.T) {
 		t.Fatalf("Should be ready for block read")
 	}
 	block, status := it.Next()
-	if status != ab.Status_SUCCESS {
+	if status != cb.Status_SUCCESS {
 		t.Fatalf("Expected to successfully read the genesis block")
 	}
 	if block.Header.Number != 0 {
@@ -168,7 +168,7 @@ func testRetrieval(lf ledgerFactory, t *testing.T) {
 		t.Fatalf("Should still be ready for block read")
 	}
 	block, status = it.Next()
-	if status != ab.Status_SUCCESS {
+	if status != cb.Status_SUCCESS {
 		t.Fatalf("Expected to successfully read the second block")
 	}
 	if block.Header.Number != 1 {
@@ -199,7 +199,7 @@ func testBlockedRetrieval(lf ledgerFactory, t *testing.T) {
 		t.Fatalf("Should now be ready for block read")
 	}
 	block, status := it.Next()
-	if status != ab.Status_SUCCESS {
+	if status != cb.Status_SUCCESS {
 		t.Fatalf("Expected to successfully read the second block")
 	}
 	if block.Header.Number != 1 {

orderer/rawledger/fileledger/fileledger.go

@@ -200,16 +200,16 @@ func (fl *fileLedger) Iterator(startType ab.SeekInfo_StartType, specified uint64
 }
 
 // Next blocks until there is a new block available, or returns an error if the next block is no longer retrievable
-func (cu *cursor) Next() (*cb.Block, ab.Status) {
+func (cu *cursor) Next() (*cb.Block, cb.Status) {
 	// This only loops once, as signal reading indicates the new block has been written
 	for {
 		block, found := cu.fl.readBlock(cu.blockNumber)
 		if found {
 			if block == nil {
-				return nil, ab.Status_SERVICE_UNAVAILABLE
+				return nil, cb.Status_SERVICE_UNAVAILABLE
 			}
 			cu.blockNumber++
-			return block, ab.Status_SUCCESS
+			return block, cb.Status_SUCCESS
 		}
 		<-cu.fl.signal
 	}

orderer/rawledger/fileledger/fileledger_test.go

@@ -122,7 +122,7 @@ func TestRetrieval(t *testing.T) {
 		t.Fatalf("Should be ready for block read")
 	}
 	block, status := it.Next()
-	if status != ab.Status_SUCCESS {
+	if status != cb.Status_SUCCESS {
 		t.Fatalf("Expected to successfully read the genesis block")
 	}
 	if block.Header.Number != 0 {
@@ -135,7 +135,7 @@ func TestRetrieval(t *testing.T) {
 		t.Fatalf("Should still be ready for block read")
 	}
 	block, status = it.Next()
-	if status != ab.Status_SUCCESS {
+	if status != cb.Status_SUCCESS {
 		t.Fatalf("Expected to successfully read the second block")
 	}
 	if block.Header.Number != 1 {
@@ -163,7 +163,7 @@ func TestBlockedRetrieval(t *testing.T) {
 		t.Fatalf("Should now be ready for block read")
 	}
 	block, status := it.Next()
-	if status != ab.Status_SUCCESS {
+	if status != cb.Status_SUCCESS {
 		t.Fatalf("Expected to successfully read the second block")
 	}
 	if block.Header.Number != 1 {