From d40e10cb07ae76b823785690ee01767d86469b00 Mon Sep 17 00:00:00 2001 From: Jason Yellick Date: Mon, 23 Jan 2017 14:23:48 -0500 Subject: [PATCH] BROKEN_BUILD Fix orderer merge problem The multichain package in orderer was refactored and merged which caused a code conflict in multichain/chainsupport.go. This fixes that. Change-Id: Ia29368c80448fe1d22f1fe9dacd70ca6f96812c3 Signed-off-by: Jason Yellick --- orderer/multichain/chainsupport.go | 2 +- orderer/multichain/chainsupport_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/orderer/multichain/chainsupport.go b/orderer/multichain/chainsupport.go index 1114f489e14..8114fed6103 100644 --- a/orderer/multichain/chainsupport.go +++ b/orderer/multichain/chainsupport.go @@ -125,7 +125,7 @@ func newChainSupport( // Assuming a block created with cb.NewBlock(), this should not // error even if the orderer metadata is an empty byte slice if err != nil { - logger.Fatalf("Error extracting orderer metadata for chain %x: %s", configManager.ChainID(), err) + logger.Fatalf("Error extracting orderer metadata for chain %x: %s", cs.ChainID(), err) } cs.chain, err = consenter.HandleChain(cs, metadata) diff --git a/orderer/multichain/chainsupport_test.go b/orderer/multichain/chainsupport_test.go index bf6015d789b..52911a3a472 100644 --- a/orderer/multichain/chainsupport_test.go +++ b/orderer/multichain/chainsupport_test.go @@ -100,7 +100,7 @@ func TestWriteBlockSignatures(t *testing.T) { func TestWriteBlockOrdererMetadata(t *testing.T) { ml := &mockLedgerReadWriter{} cm := &mockconfigtx.Manager{} - cs := &chainSupport{ledger: ml, configManager: cm, signer: &xxxCryptoHelper{}} + cs := &chainSupport{ledgerResources: &ledgerResources{configResources: &configResources{Manager: cm}, ledger: ml}, signer: &xxxCryptoHelper{}} value := []byte("foo") expected := &cb.Metadata{Value: value}