[FAB-7105] Move orderer/common/util to common/util

The orderer/common/util only contains 1 file (net.go) that contains only 1 function (ExtractRemoteAddress). This function can be used by any gRPC service, and therefore its place should be in common/util. Change-Id: Ie0fc7890a9091337ba4f85f113de9807e346da34 Signed-off-by: yacovm <[email protected]>
hyperledger · Nov 26, 2017 · 943f0ce · 943f0ce
1 parent c1a8eb1
commit 943f0ce
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/orderer/common/util/net.go → common/util/net.go b/orderer/common/util/net.go → common/util/net.go
diff --git a/orderer/common/util/net_test.go → common/util/net_test.go b/orderer/common/util/net_test.go → common/util/net_test.go
diff --git a/orderer/common/broadcast/broadcast.go b/orderer/common/broadcast/broadcast.go
@@ -10,11 +10,10 @@ import (
 	"io"
 
 	"github.com/hyperledger/fabric/common/flogging"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/orderer/common/msgprocessor"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
-
-	"github.com/hyperledger/fabric/orderer/common/util"
 	"github.com/op/go-logging"
 	"github.com/pkg/errors"
 )

diff --git a/orderer/common/deliver/deliver.go b/orderer/common/deliver/deliver.go
@@ -19,17 +19,16 @@ package deliver
 import (
 	"io"
 
+	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/common/policies"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/orderer/common/ledger"
 	"github.com/hyperledger/fabric/orderer/common/msgprocessor"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
-	"github.com/op/go-logging"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/orderer/common/util"
 	"github.com/hyperledger/fabric/protos/utils"
+	"github.com/op/go-logging"
 )
 
 const pkgLogID = "orderer/common/deliver"