Skip to content

Commit

Permalink
[FAB-3513] Can't build OTE
Browse files Browse the repository at this point in the history
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 <Nao.nishijima@hal.hitachi.com>
  • Loading branch information
Nao Nishijima authored and Nao Nishijima committed Jun 2, 2017
1 parent a01b2f9 commit 719c208
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions bddtests/regression/go/ote/ote.go
Expand Up @@ -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{
Expand Down Expand Up @@ -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,
})
Expand Down Expand Up @@ -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

////////////////////////////////////////////////////////////////////////
Expand Down

0 comments on commit 719c208

Please sign in to comment.