From 6d5a628e6752adec6d29cbaeb2dda70894749c72 Mon Sep 17 00:00:00 2001 From: Jason Yellick Date: Wed, 25 Jan 2017 14:10:47 -0500 Subject: [PATCH] [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 --- common/configtx/filter_test.go | 2 +- common/configtx/manager_test.go | 2 +- {orderer => common}/mocks/configtx/configtx.go | 0 {orderer => common}/mocks/configtx/configtx_test.go | 0 orderer/multichain/chainsupport_test.go | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename {orderer => common}/mocks/configtx/configtx.go (100%) rename {orderer => common}/mocks/configtx/configtx_test.go (100%) diff --git a/common/configtx/filter_test.go b/common/configtx/filter_test.go index 2f1e89ef492..d75a5be17c8 100644 --- 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 index 2ad74df332b..561cae4dcf5 100644 --- 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 b/common/mocks/configtx/configtx.go similarity index 100% rename from orderer/mocks/configtx/configtx.go rename to common/mocks/configtx/configtx.go diff --git a/orderer/mocks/configtx/configtx_test.go b/common/mocks/configtx/configtx_test.go similarity index 100% rename from orderer/mocks/configtx/configtx_test.go rename to common/mocks/configtx/configtx_test.go diff --git a/orderer/multichain/chainsupport_test.go b/orderer/multichain/chainsupport_test.go index 52911a3a472..f1ade64335e 100644 --- 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"