Move simplebft to orderer and fix proto compile

Proto compilation was broken for sbft.  In order to fix this, the
simplebft.proto needed to be under the same proto root as the
config.proto and consensus.proto from the sbft package.

This seemed like an opportune time to move the simplebft code out of the
legacy consensus dir and into orderer dir.

Change-Id: Ie84dfaede6ebd5a2cffdcd021bf1d2f1966979f2
Signed-off-by: Jason Yellick <[email protected]>

Author: Jason Yellick

orderer/sbft/.protoroot

@@ -39,10 +39,10 @@ import (
 	"encoding/asn1"
 
 	"github.com/golang/protobuf/proto"
-	s "github.com/hyperledger/fabric/consensus/simplebft"
 	"github.com/hyperledger/fabric/orderer/rawledger"
 	"github.com/hyperledger/fabric/orderer/sbft/connection"
 	"github.com/hyperledger/fabric/orderer/sbft/persist"
+	s "github.com/hyperledger/fabric/orderer/sbft/simplebft"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"github.com/op/go-logging"

orderer/sbft/backend/backend.go

@@ -2,10 +2,12 @@ syntax = "proto3";
 
 package backend;
 
-import "github.com/hyperledger/fabric/consensus/simplebft/simplebft.proto";
+option go_package = "github.com/hyperledger/fabric/orderer/sbft/backend";
+
+import "simplebft/simplebft.proto";
 
 service consensus {
-    rpc consensus(handshake) returns (stream simplebft.msg) {}
+    rpc consensus(handshake) returns (stream simplebft.Msg) {}
 }
 
 message handshake {

orderer/sbft/backend/consensus.pb.go

@@ -17,7 +17,7 @@ limitations under the License.
 package backend
 
 import (
-	s "github.com/hyperledger/fabric/consensus/simplebft"
+	s "github.com/hyperledger/fabric/orderer/sbft/simplebft"
 )
 
 type Timer struct {

orderer/sbft/backend/consensus.proto

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package sbft
 
 import (
 	"encoding/json"

orderer/sbft/backend/events.go

@@ -16,17 +16,19 @@ limitations under the License.
 
 syntax = "proto3";
 
-package main;
+option go_package = "github.com/hyperledger/fabric/orderer/sbft";
 
-import "github.com/hyperledger/fabric/consensus/simplebft/simplebft.proto";
+package sbft;
+
+import "simplebft/simplebft.proto";
 
 message consensus_config {
-        simplebft.config consensus = 1;
+        simplebft.Config consensus = 1;
         map<string, bytes> peers = 2;
 };
 
 message json_config {
-        simplebft.config consensus = 1;
+        simplebft.Config consensus = 1;
         repeated peer peers = 2;
 };
 

orderer/sbft/config.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package sbft
 
 import (
 	"flag"
@@ -23,12 +23,12 @@ import (
 	_ "net/http/pprof"
 	"os"
 
-	pb "github.com/hyperledger/fabric/consensus/simplebft"
 	"github.com/hyperledger/fabric/orderer/common/bootstrap/static"
 	"github.com/hyperledger/fabric/orderer/rawledger/fileledger"
 	"github.com/hyperledger/fabric/orderer/sbft/backend"
 	"github.com/hyperledger/fabric/orderer/sbft/connection"
 	"github.com/hyperledger/fabric/orderer/sbft/persist"
+	pb "github.com/hyperledger/fabric/orderer/sbft/simplebft"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"github.com/op/go-logging"
 	"google.golang.org/grpc"

orderer/sbft/config.pb.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package sbft
 
 import (
 	"fmt"