From 719c2086b774231efe7a4a6e3c6c0c8ced26db93 Mon Sep 17 00:00:00 2001 From: Nao Nishijima Date: Thu, 1 Jun 2017 17:17:35 -0700 Subject: [PATCH] [FAB-3513] Can't build OTE Building OTE fails because some literals assign different type field. This patch converted those literals to byte using utils.MarshalOrPanic. Change-Id: I3c88dcdacd71eda31f5c0ec73d5650c0339f88da Signed-off-by: Nao Nishijima --- bddtests/regression/go/ote/ote.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bddtests/regression/go/ote/ote.go b/bddtests/regression/go/ote/ote.go index c6ab60b9119..7baf6ccec26 100644 --- a/bddtests/regression/go/ote/ote.go +++ b/bddtests/regression/go/ote/ote.go @@ -199,10 +199,10 @@ func seekHelper(chainID string, start *ab.SeekPosition) *cb.Envelope { //ChainHeader: &cb.ChainHeader{ // ChainID: b.chainID, //}, - ChannelHeader: &cb.ChannelHeader{ + ChannelHeader: utils.MarshalOrPanic(&cb.ChannelHeader{ ChannelId: chainID, - }, - SignatureHeader: &cb.SignatureHeader{}, + }), + SignatureHeader: utils.MarshalOrPanic(&cb.SignatureHeader{}), }, Data: utils.MarshalOrPanic(&ab.SeekInfo{ @@ -262,10 +262,10 @@ func (b *broadcastClient) broadcast(transaction []byte) error { //ChainHeader: &cb.ChainHeader{ // ChainID: b.chainID, //}, - ChannelHeader: &cb.ChannelHeader{ + ChannelHeader: utils.MarshalOrPanic(&cb.ChannelHeader{ ChannelId: b.chainID, - }, - SignatureHeader: &cb.SignatureHeader{}, + }), + SignatureHeader: utils.MarshalOrPanic(&cb.SignatureHeader{}), }, Data: transaction, }) @@ -778,8 +778,8 @@ func ote(testname string, txs int64, chans int, orderers int, ordType string, kb // Establish the default configuration from yaml files - and this also // picks up any variables overridden on command line or in environment - ordConf = config.Load() - genConf = genesisconfig.Load() + ordConf := config.Load() + genConf := genesisconfig.Load(genesisconfig.SampleInsecureProfile) var launchAppendFlags string ////////////////////////////////////////////////////////////////////////