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 <jyellick@us.ibm.com>
hyperledger · Nov 9, 2016 · 1230e0f · 1230e0f
1 parent 1950782
commit 1230e0f
Show file tree

Hide file tree

Showing 35 changed files with 206 additions and 128 deletions.
diff --git a/orderer/sbft/.protoroot b/orderer/sbft/.protoroot
diff --git a/orderer/sbft/backend/backend.go b/orderer/sbft/backend/backend.go
@@ -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"

diff --git a/orderer/sbft/backend/consensus.pb.go b/orderer/sbft/backend/consensus.pb.go
diff --git a/orderer/sbft/backend/consensus.proto b/orderer/sbft/backend/consensus.proto
@@ -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 {

diff --git a/orderer/sbft/backend/events.go b/orderer/sbft/backend/events.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 {

diff --git a/orderer/sbft/config.go b/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 (
 	"encoding/json"

diff --git a/orderer/sbft/config.pb.go b/orderer/sbft/config.pb.go
diff --git a/orderer/sbft/config.proto b/orderer/sbft/config.proto
@@ -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;
 };
 

diff --git a/orderer/sbft/main.go b/orderer/sbft/main.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"

diff --git a/orderer/sbft/sbft_test.go b/orderer/sbft/sbft_test.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"

diff --git a/consensus/simplebft/backlog.go → orderer/sbft/simplebft/backlog.go b/consensus/simplebft/backlog.go → orderer/sbft/simplebft/backlog.go
diff --git a/consensus/simplebft/batch.go → orderer/sbft/simplebft/batch.go b/consensus/simplebft/batch.go → orderer/sbft/simplebft/batch.go
diff --git a/consensus/simplebft/calendarqueue_test.go → orderer/sbft/simplebft/calendarqueue_test.go b/consensus/simplebft/calendarqueue_test.go → orderer/sbft/simplebft/calendarqueue_test.go
diff --git a/consensus/simplebft/checkpoint.go → orderer/sbft/simplebft/checkpoint.go b/consensus/simplebft/checkpoint.go → orderer/sbft/simplebft/checkpoint.go
diff --git a/consensus/simplebft/commit.go → orderer/sbft/simplebft/commit.go b/consensus/simplebft/commit.go → orderer/sbft/simplebft/commit.go
diff --git a/consensus/simplebft/connection.go → orderer/sbft/simplebft/connection.go b/consensus/simplebft/connection.go → orderer/sbft/simplebft/connection.go
diff --git a/consensus/simplebft/crypto.go → orderer/sbft/simplebft/crypto.go b/consensus/simplebft/crypto.go → orderer/sbft/simplebft/crypto.go
diff --git a/consensus/simplebft/crypto_test.go → orderer/sbft/simplebft/crypto_test.go b/consensus/simplebft/crypto_test.go → orderer/sbft/simplebft/crypto_test.go
diff --git a/consensus/simplebft/execute.go → orderer/sbft/simplebft/execute.go b/consensus/simplebft/execute.go → orderer/sbft/simplebft/execute.go
diff --git a/consensus/simplebft/newview.go → orderer/sbft/simplebft/newview.go b/consensus/simplebft/newview.go → orderer/sbft/simplebft/newview.go
diff --git a/consensus/simplebft/newview_test.go → orderer/sbft/simplebft/newview_test.go b/consensus/simplebft/newview_test.go → orderer/sbft/simplebft/newview_test.go
diff --git a/consensus/simplebft/prepare.go → orderer/sbft/simplebft/prepare.go b/consensus/simplebft/prepare.go → orderer/sbft/simplebft/prepare.go
diff --git a/consensus/simplebft/preprepare.go → orderer/sbft/simplebft/preprepare.go b/consensus/simplebft/preprepare.go → orderer/sbft/simplebft/preprepare.go
diff --git a/consensus/simplebft/request.go → orderer/sbft/simplebft/request.go b/consensus/simplebft/request.go → orderer/sbft/simplebft/request.go
diff --git a/consensus/simplebft/simplebft.go → orderer/sbft/simplebft/simplebft.go b/consensus/simplebft/simplebft.go → orderer/sbft/simplebft/simplebft.go