From 7da23389447922496c8b996612876944b5d2ecca Mon Sep 17 00:00:00 2001 From: Jason Yellick Date: Mon, 12 Dec 2016 15:40:05 -0500 Subject: [PATCH] Fix import cycle after merge Despite the verification running and returning positive, the merge seems to have created an import cycle, this changeset fixes that. Change-Id: I903766efa524f942d8389bebea27ca0b4e373aa5 Signed-off-by: Jason Yellick --- orderer/multichain/manager_test.go | 2 +- orderer/multichain/systemchain.go | 3 ++- orderer/multichain/systemchain_test.go | 8 ++++---- .../sample_clients/broadcast_config/newchain.go | 3 +-- protos/utils/blockutils.go | 4 ++-- protos/{orderer => utils}/configuration.go | 16 ++++++++-------- 6 files changed, 18 insertions(+), 18 deletions(-) rename protos/{orderer => utils}/configuration.go (86%) diff --git a/orderer/multichain/manager_test.go b/orderer/multichain/manager_test.go index 61992ad3a79..574fc1bf2f4 100644 --- a/orderer/multichain/manager_test.go +++ b/orderer/multichain/manager_test.go @@ -150,7 +150,7 @@ func TestNewChain(t *testing.T) { oldConfigEnv := utils.UnmarshalConfigurationEnvelopeOrPanic(oldGenesisTxPayload.Data) newChainID := "TestNewChain" - newChainMessage := ab.ChainCreationConfigurationTransaction(static.AcceptAllPolicyKey, newChainID, oldConfigEnv) + newChainMessage := utils.ChainCreationConfigurationTransaction(static.AcceptAllPolicyKey, newChainID, oldConfigEnv) status := manager.ProposeChain(newChainMessage) diff --git a/orderer/multichain/systemchain.go b/orderer/multichain/systemchain.go index 8e8c797a1df..27e4dfb0e36 100644 --- a/orderer/multichain/systemchain.go +++ b/orderer/multichain/systemchain.go @@ -26,6 +26,7 @@ import ( "github.com/hyperledger/fabric/orderer/common/sharedconfig" cb "github.com/hyperledger/fabric/protos/common" ab "github.com/hyperledger/fabric/protos/orderer" + "github.com/hyperledger/fabric/protos/utils" "github.com/golang/protobuf/proto" ) @@ -153,7 +154,7 @@ func (sc *systemChain) authorize(configEnvelope *cb.ConfigurationEnvelope) cb.St return cb.Status_BAD_REQUEST } - if creationConfigItem.Key != ab.CreationPolicyKey { + if creationConfigItem.Key != utils.CreationPolicyKey { logger.Debugf("Failing to validate chain creation because first configuration item was not the CreationPolicy") return cb.Status_BAD_REQUEST } diff --git a/orderer/multichain/systemchain_test.go b/orderer/multichain/systemchain_test.go index 550045977e8..115f1f39f7a 100644 --- a/orderer/multichain/systemchain_test.go +++ b/orderer/multichain/systemchain_test.go @@ -128,7 +128,7 @@ func TestGoodProposal(t *testing.T) { ChainID: newChainID, Type: int32(cb.HeaderType_CONFIGURATION_ITEM), }, - Key: ab.CreationPolicyKey, + Key: utils.CreationPolicyKey, Type: cb.ConfigurationItem_Orderer, Value: utils.MarshalOrPanic(&ab.CreationPolicy{ Policy: static.AcceptAllPolicyKey, @@ -185,7 +185,7 @@ func TestProposalWithBadPolicy(t *testing.T) { mcc.ms.mpm.mp = &mockPolicy{} chainCreateTx := &cb.ConfigurationItem{ - Key: ab.CreationPolicyKey, + Key: utils.CreationPolicyKey, Type: cb.ConfigurationItem_Orderer, Value: utils.MarshalOrPanic(&ab.CreationPolicy{ Policy: static.AcceptAllPolicyKey, @@ -208,7 +208,7 @@ func TestProposalWithMissingPolicy(t *testing.T) { mcc.ms.msc.chainCreators = []string{static.AcceptAllPolicyKey} chainCreateTx := &cb.ConfigurationItem{ - Key: ab.CreationPolicyKey, + Key: utils.CreationPolicyKey, Type: cb.ConfigurationItem_Orderer, Value: utils.MarshalOrPanic(&ab.CreationPolicy{ Policy: static.AcceptAllPolicyKey, @@ -232,7 +232,7 @@ func TestProposalWithBadDigest(t *testing.T) { mcc.ms.msc.chainCreators = []string{static.AcceptAllPolicyKey} chainCreateTx := &cb.ConfigurationItem{ - Key: ab.CreationPolicyKey, + Key: utils.CreationPolicyKey, Type: cb.ConfigurationItem_Orderer, Value: utils.MarshalOrPanic(&ab.CreationPolicy{ Policy: static.AcceptAllPolicyKey, diff --git a/orderer/sample_clients/broadcast_config/newchain.go b/orderer/sample_clients/broadcast_config/newchain.go index d6069b1879d..31fc6e1b447 100644 --- a/orderer/sample_clients/broadcast_config/newchain.go +++ b/orderer/sample_clients/broadcast_config/newchain.go @@ -19,7 +19,6 @@ package main import ( "github.com/hyperledger/fabric/orderer/common/bootstrap/static" cb "github.com/hyperledger/fabric/protos/common" - ab "github.com/hyperledger/fabric/protos/orderer" "github.com/hyperledger/fabric/protos/utils" ) @@ -39,5 +38,5 @@ func newChainRequest(creationPolicy, newChainID string) *cb.Envelope { oldGenesisTxPayload := utils.ExtractPayloadOrPanic(oldGenesisTx) oldConfigEnv := utils.UnmarshalConfigurationEnvelopeOrPanic(oldGenesisTxPayload.Data) - return ab.ChainCreationConfigurationTransaction(static.AcceptAllPolicyKey, newChainID, oldConfigEnv) + return utils.ChainCreationConfigurationTransaction(static.AcceptAllPolicyKey, newChainID, oldConfigEnv) } diff --git a/protos/utils/blockutils.go b/protos/utils/blockutils.go index 8772af64487..7306ca552e7 100644 --- a/protos/utils/blockutils.go +++ b/protos/utils/blockutils.go @@ -21,8 +21,8 @@ import ( "github.com/golang/protobuf/proto" - "github.com/hyperledger/fabric/orderer/common/cauthdsl" - "github.com/hyperledger/fabric/orderer/common/configtx" + "github.com/hyperledger/fabric/common/cauthdsl" + "github.com/hyperledger/fabric/common/configtx" cb "github.com/hyperledger/fabric/protos/common" ab "github.com/hyperledger/fabric/protos/orderer" ) diff --git a/protos/orderer/configuration.go b/protos/utils/configuration.go similarity index 86% rename from protos/orderer/configuration.go rename to protos/utils/configuration.go index 0871e9e8282..dfc3c0eed23 100644 --- a/protos/orderer/configuration.go +++ b/protos/utils/configuration.go @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -package orderer +package utils import ( cu "github.com/hyperledger/fabric/core/util" cb "github.com/hyperledger/fabric/protos/common" - "github.com/hyperledger/fabric/protos/utils" + ab "github.com/hyperledger/fabric/protos/orderer" ) const CreationPolicyKey = "CreationPolicy" @@ -34,10 +34,10 @@ func ChainCreationConfiguration(creationPolicy, newChainID string, template *cb. var hashBytes []byte for i, item := range template.Items { - configItem := utils.UnmarshalConfigurationItemOrPanic(item.ConfigurationItem) + configItem := UnmarshalConfigurationItemOrPanic(item.ConfigurationItem) configItem.Header.ChainID = newChainID newConfigItems[i] = &cb.SignedConfigurationItem{ - ConfigurationItem: utils.MarshalOrPanic(configItem), + ConfigurationItem: MarshalOrPanic(configItem), } hashBytes = append(hashBytes, newConfigItems[i].ConfigurationItem...) } @@ -45,14 +45,14 @@ func ChainCreationConfiguration(creationPolicy, newChainID string, template *cb. digest := cu.ComputeCryptoHash(hashBytes) authorizeItem := &cb.SignedConfigurationItem{ - ConfigurationItem: utils.MarshalOrPanic(&cb.ConfigurationItem{ + ConfigurationItem: MarshalOrPanic(&cb.ConfigurationItem{ Header: &cb.ChainHeader{ ChainID: newChainID, Type: int32(cb.HeaderType_CONFIGURATION_ITEM), }, Type: cb.ConfigurationItem_Orderer, Key: CreationPolicyKey, - Value: utils.MarshalOrPanic(&CreationPolicy{ + Value: MarshalOrPanic(&ab.CreationPolicy{ Policy: creationPolicy, Digest: digest, }), @@ -73,14 +73,14 @@ func ChainCreationConfigurationTransaction(creationPolicy, newChainID string, te configurationEnvelope := ChainCreationConfiguration(creationPolicy, newChainID, template) newGenesisTx := &cb.Envelope{ - Payload: utils.MarshalOrPanic(&cb.Payload{ + Payload: MarshalOrPanic(&cb.Payload{ Header: &cb.Header{ ChainHeader: &cb.ChainHeader{ Type: int32(cb.HeaderType_CONFIGURATION_TRANSACTION), ChainID: newChainID, }, }, - Data: utils.MarshalOrPanic(configurationEnvelope), + Data: MarshalOrPanic(configurationEnvelope), }), }