Skip to content

Commit 719c208

Browse files
Nao NishijimaNao Nishijima
Nao Nishijima
authored and
Nao Nishijima
committed
[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 <[email protected]>
1 parent a01b2f9 commit 719c208

File tree

1 file changed

+8
-8
lines changed
  • bddtests/regression/go/ote

1 file changed

+8
-8
lines changed

bddtests/regression/go/ote/ote.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,10 @@ func seekHelper(chainID string, start *ab.SeekPosition) *cb.Envelope {
199199
//ChainHeader: &cb.ChainHeader{
200200
// ChainID: b.chainID,
201201
//},
202-
ChannelHeader: &cb.ChannelHeader{
202+
ChannelHeader: utils.MarshalOrPanic(&cb.ChannelHeader{
203203
ChannelId: chainID,
204-
},
205-
SignatureHeader: &cb.SignatureHeader{},
204+
}),
205+
SignatureHeader: utils.MarshalOrPanic(&cb.SignatureHeader{}),
206206
},
207207

208208
Data: utils.MarshalOrPanic(&ab.SeekInfo{
@@ -262,10 +262,10 @@ func (b *broadcastClient) broadcast(transaction []byte) error {
262262
//ChainHeader: &cb.ChainHeader{
263263
// ChainID: b.chainID,
264264
//},
265-
ChannelHeader: &cb.ChannelHeader{
265+
ChannelHeader: utils.MarshalOrPanic(&cb.ChannelHeader{
266266
ChannelId: b.chainID,
267-
},
268-
SignatureHeader: &cb.SignatureHeader{},
267+
}),
268+
SignatureHeader: utils.MarshalOrPanic(&cb.SignatureHeader{}),
269269
},
270270
Data: transaction,
271271
})
@@ -778,8 +778,8 @@ func ote(testname string, txs int64, chans int, orderers int, ordType string, kb
778778

779779
// Establish the default configuration from yaml files - and this also
780780
// picks up any variables overridden on command line or in environment
781-
ordConf = config.Load()
782-
genConf = genesisconfig.Load()
781+
ordConf := config.Load()
782+
genConf := genesisconfig.Load(genesisconfig.SampleInsecureProfile)
783783
var launchAppendFlags string
784784

785785
////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)