[FAB-1857] Move orderer/mocks/configtx to common

https://jira.hyperledger.org/browse/FAB-1857 The configtx package was originally part of the orderer, so its mock was created in the orderer. However, configtx has moved to common and other non-orderer packages may wish to utilize the mocks, so they should go to common as well. Change-Id: Ia94ffd80bf8f866aaeaaa5422a31db485f7e2a38 Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
hyperledger · Jan 30, 2017 · 6d5a628 · 6d5a628
1 parent 37f3a4e
commit 6d5a628
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/common/configtx/filter_test.go b/common/configtx/filter_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 
 	. "github.com/hyperledger/fabric/common/configtx"
+	mockconfigtx "github.com/hyperledger/fabric/common/mocks/configtx"
 	"github.com/hyperledger/fabric/orderer/common/filter"
-	mockconfigtx "github.com/hyperledger/fabric/orderer/mocks/configtx"
 	cb "github.com/hyperledger/fabric/protos/common"
 
 	"github.com/golang/protobuf/proto"

diff --git a/common/configtx/manager_test.go b/common/configtx/manager_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 
 	. "github.com/hyperledger/fabric/common/configtx"
+	mockconfigtx "github.com/hyperledger/fabric/common/mocks/configtx"
 	"github.com/hyperledger/fabric/common/policies"
-	mockconfigtx "github.com/hyperledger/fabric/orderer/mocks/configtx"
 	cb "github.com/hyperledger/fabric/protos/common"
 
 	"errors"

diff --git a/orderer/mocks/configtx/configtx.go → common/mocks/configtx/configtx.go b/orderer/mocks/configtx/configtx.go → common/mocks/configtx/configtx.go
diff --git a/orderer/mocks/configtx/configtx_test.go → common/mocks/configtx/configtx_test.go b/orderer/mocks/configtx/configtx_test.go → common/mocks/configtx/configtx_test.go
diff --git a/orderer/multichain/chainsupport_test.go b/orderer/multichain/chainsupport_test.go
@@ -21,9 +21,9 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/proto"
+	mockconfigtx "github.com/hyperledger/fabric/common/mocks/configtx"
 	"github.com/hyperledger/fabric/orderer/common/filter"
 	ordererledger "github.com/hyperledger/fabric/orderer/ledger"
-	mockconfigtx "github.com/hyperledger/fabric/orderer/mocks/configtx"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric/protos/utils"