Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chan.Part.API: Cleanup system channel w/ genesis block IT #2055

Merged
merged 1 commit into from
Oct 28, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions integration/raft/channel_participation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -524,13 +524,11 @@ var _ = Describe("ChannelParticipation", func() {
By("attempting to join a channel when system channel is present")
channelparticipationJoinFailure(network, orderer1, "systemchannel", systemChannelBlock, http.StatusMethodNotAllowed, "cannot join: system channel exists")

By("attempting to submit a transaction to systemchannel")
By("ensuring the system channel is unusable before restarting by attempting to submit a transaction")
for _, o := range orderers {
By("submitting transaction to " + o.Name)
env := CreateBroadcastEnvelope(network, peer, "systemchannel", []byte("hello"))
resp, err := ordererclient.Broadcast(network, o, env)
Expect(err).NotTo(HaveOccurred())
Expect(resp.Status).To(Equal(common.Status_FORBIDDEN))
Expect(broadcastTransactionFunc(network, o, env)()).To(Equal(common.Status_FORBIDDEN))
}

By("restarting all orderers")
Expand Down Expand Up @@ -576,11 +574,8 @@ var _ = Describe("ChannelParticipation", func() {

By("submitting transaction to orderer to confirm channel is usable")
env := CreateBroadcastEnvelope(network, peer, "testchannel", []byte("hello"))
resp, err := ordererclient.Broadcast(network, orderer1, env)
Expect(err).NotTo(HaveOccurred())
Expect(resp.Status).To(Equal(common.Status_SUCCESS))
Eventually(broadcastTransactionFunc(network, orderer1, env), network.EventuallyTimeout).Should(Equal(common.Status_SUCCESS))
})

})

Describe("three node etcdraft network with a system channel", func() {
Expand Down