From 79aa652ad5016cbaf70b5bdcf9e28e4b3920ad49 Mon Sep 17 00:00:00 2001 From: Jason Yellick Date: Thu, 9 Feb 2017 10:34:04 -0500 Subject: [PATCH] [FAB-2146] Move policies mocks to common https://jira.hyperledger.org/browse/FAB-2146 The policies package used to be part of the orderer but has been pushed to common. However, the mocks were not moved to common. This CR remedies that situation. Change-Id: Id0af2eda3ccd03283ee5a236fb2b809785b0ed09 Signed-off-by: Jason Yellick --- {orderer => common}/mocks/policies/policies.go | 0 {orderer => common}/mocks/policies/policies_test.go | 0 orderer/common/deliver/deliver_test.go | 2 +- orderer/common/sigfilter/sigfilter_test.go | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {orderer => common}/mocks/policies/policies.go (100%) rename {orderer => common}/mocks/policies/policies_test.go (100%) diff --git a/orderer/mocks/policies/policies.go b/common/mocks/policies/policies.go similarity index 100% rename from orderer/mocks/policies/policies.go rename to common/mocks/policies/policies.go diff --git a/orderer/mocks/policies/policies_test.go b/common/mocks/policies/policies_test.go similarity index 100% rename from orderer/mocks/policies/policies_test.go rename to common/mocks/policies/policies_test.go diff --git a/orderer/common/deliver/deliver_test.go b/orderer/common/deliver/deliver_test.go index ef3c39221ed..0827378b1d3 100644 --- a/orderer/common/deliver/deliver_test.go +++ b/orderer/common/deliver/deliver_test.go @@ -23,12 +23,12 @@ import ( configtxapi "github.com/hyperledger/fabric/common/configtx/api" mockconfigtxorderer "github.com/hyperledger/fabric/common/mocks/configtx/handlers/orderer" + mockpolicies "github.com/hyperledger/fabric/common/mocks/policies" "github.com/hyperledger/fabric/common/policies" "github.com/hyperledger/fabric/orderer/common/bootstrap/provisional" ordererledger "github.com/hyperledger/fabric/orderer/ledger" ramledger "github.com/hyperledger/fabric/orderer/ledger/ram" "github.com/hyperledger/fabric/orderer/localconfig" - mockpolicies "github.com/hyperledger/fabric/orderer/mocks/policies" cb "github.com/hyperledger/fabric/protos/common" ab "github.com/hyperledger/fabric/protos/orderer" "github.com/hyperledger/fabric/protos/utils" diff --git a/orderer/common/sigfilter/sigfilter_test.go b/orderer/common/sigfilter/sigfilter_test.go index 71d0d9e7794..3e1c9a36c87 100644 --- a/orderer/common/sigfilter/sigfilter_test.go +++ b/orderer/common/sigfilter/sigfilter_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" + mockpolicies "github.com/hyperledger/fabric/common/mocks/policies" "github.com/hyperledger/fabric/orderer/common/filter" - mockpolicies "github.com/hyperledger/fabric/orderer/mocks/policies" cb "github.com/hyperledger/fabric/protos/common" "github.com/hyperledger/fabric/protos/utils"