added to OSN new handler for update config of channel

Signed-off-by: Fedor Partanskiy <fredprtnsk@gmail.com>

Author: pfi79

integration/nwo/configblock.go

@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package nwo
 
 import (
+	"net/http"
 	"os"
 	"path/filepath"
 
@@ -155,16 +156,6 @@ func UpdateConfig(n *Network, orderer *Orderer, channel string, current, updated
 	}()
 	Eventually(ready, n.EventuallyTimeout).Should(BeClosed())
 
-	// sess, err := n.PeerAdminSession(submitter, commands.ChannelUpdate{
-	// 	ChannelID:  channel,
-	// 	Orderer:    n.OrdererAddress(orderer, ListenPort),
-	// 	File:       updateFile,
-	// 	ClientAuth: n.ClientAuthRequired,
-	// })
-	// Expect(err).NotTo(HaveOccurred())
-	// Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
-	// Expect(sess.Err).To(gbytes.Say("Successfully submitted channel update"))
-
 	if getConfigBlockFromOrderer {
 		ccb := func() uint64 { return CurrentConfigBlockNumber(n, submitter, orderer, channel) }
 		Eventually(ccb, n.EventuallyTimeout).Should(BeNumerically(">", currentBlockNumber))
@@ -250,25 +241,37 @@ func UpdateOrdererConfig(n *Network, orderer *Orderer, channel string, current,
 	Eventually(ccb, n.EventuallyTimeout).Should(BeNumerically(">", currentBlockNumber))
 }
 
-// UpdateOrdererConfigSession computes, signs, and submits a configuration
+// UpdateOrdererConfigFails computes, signs, and submits a configuration
 // update which requires orderer signatures. The caller should wait on the
 // returned seession retrieve the exit code.
-func UpdateOrdererConfigSession(n *Network, orderer *Orderer, channel string, current, updated *common.Config, submitter *Peer, additionalSigners ...*Orderer) *gexec.Session {
+func UpdateOrdererConfigFails(n *Network, orderer *Orderer, channel string, current, updated *common.Config, errStr string, submitter *Peer, additionalSigners ...*Orderer) {
 	tempDir, err := os.MkdirTemp(n.RootDir, "updateConfig")
 	Expect(err).NotTo(HaveOccurred())
 	updateFile := filepath.Join(tempDir, "update.pb")
 
 	ComputeUpdateOrdererConfig(updateFile, n, channel, current, updated, submitter, additionalSigners...)
 
-	// session should not return with a zero exit code nor with a success response
-	sess, err := n.OrdererAdminSession(orderer, submitter, commands.ChannelUpdate{
-		ChannelID:  channel,
-		Orderer:    n.OrdererAddress(orderer, ListenPort),
+	sess, err := n.OrdererAdminSession(orderer, submitter, commands.SignConfigTx{
 		File:       updateFile,
 		ClientAuth: n.ClientAuthRequired,
 	})
 	Expect(err).NotTo(HaveOccurred())
-	return sess
+	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
+
+	updateEnvelopeBytes, err := os.ReadFile(updateFile)
+	Expect(err).NotTo(HaveOccurred())
+
+	updateEnvelope := &common.Envelope{}
+	err = proto.Unmarshal(updateEnvelopeBytes, updateEnvelope)
+	Expect(err).NotTo(HaveOccurred())
+
+	ready := make(chan struct{})
+	go func() {
+		defer GinkgoRecover()
+		UpdateWithStatus(n, orderer, channel, updateEnvelope, http.StatusBadRequest, errStr)
+		close(ready)
+	}()
+	Eventually(ready, n.EventuallyTimeout).Should(BeClosed())
 }
 
 func ComputeUpdateOrdererConfig(updateFile string, n *Network, channel string, current, updated *common.Config, submitter *Peer, additionalSigners ...*Orderer) {

integration/raft/config_test.go

@@ -242,9 +242,7 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 				Value:     protoutil.MarshalOrPanic(consensusTypeValue),
 			}
 
-			sess := nwo.UpdateOrdererConfigSession(network, orderer, "testchannel", config, updatedConfig, org1Peer0, orderer)
-			Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit(1))
-			Expect(sess.Err).To(gbytes.Say(`invalid new config metadata: ElectionTick \(10\) must be greater than HeartbeatTick \(10\)`))
+			nwo.UpdateOrdererConfigFails(network, orderer, "testchannel", config, updatedConfig, "invalid new config metadata: ElectionTick (10) must be greater than HeartbeatTick (10)", org1Peer0, orderer)
 		})
 	})
 
@@ -455,9 +453,7 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 					Port:          newConsenterPort,
 				},
 			)
-			sess = nwo.UpdateOrdererConfigSession(network, orderer, "testchannel", current, updated, peer, orderer)
-			Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit(1))
-			Expect(sess.Err).To(gbytes.Say(fmt.Sprintf("BAD_REQUEST -- error applying config update to existing channel 'testchannel': consensus metadata update for channel config update is invalid: invalid new config metadata: consenter %s:%d has invalid certificate: verifying tls client cert with serial number %d: x509: certificate signed by unknown authority", newConsenterHost, newConsenterPort, newConsenterCert.SerialNumber)))
+			nwo.UpdateOrdererConfigFails(network, orderer, "testchannel", current, updated, fmt.Sprintf("error applying config update to existing channel 'testchannel': consensus metadata update for channel config update is invalid: invalid new config metadata: consenter %s:%d has invalid certificate: verifying tls client cert with serial number %d: x509: certificate signed by unknown authority", newConsenterHost, newConsenterPort, newConsenterCert.SerialNumber), peer, orderer)
 		})
 	})
 
@@ -1092,11 +1088,7 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 			By("Removing alive node from 2/3 cluster")
 			peer := network.Peer("Org1", "peer0")
 			current, updated := consenterRemover(network, peer, o2, "testchannel", certificatesOfOrderers[1].oldCert)
-			Eventually(func() []byte {
-				sess := nwo.UpdateOrdererConfigSession(network, o2, "testchannel", current, updated, peer, o2)
-				Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit(1))
-				return sess.Err.Contents()
-			}, network.EventuallyTimeout).Should(ContainSubstring("2 out of 3 nodes are alive, configuration will result in quorum loss"))
+			nwo.UpdateOrdererConfigFails(network, o2, "testchannel", current, updated, "2 out of 3 nodes are alive, configuration will result in quorum loss", peer, o2)
 
 			By("Adding node to 2/3 cluster")
 			current, updated = consenterAdder(
@@ -1111,9 +1103,7 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 					Port:          uint32(network.OrdererPort(o1, nwo.ListenPort)),
 				},
 			)
-			sess := nwo.UpdateOrdererConfigSession(network, o2, "testchannel", current, updated, peer, o2)
-			Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit(1))
-			Expect(string(sess.Err.Contents())).To(ContainSubstring("2 out of 3 nodes are alive, configuration will result in quorum loss"))
+			nwo.UpdateOrdererConfigFails(network, o2, "testchannel", current, updated, "2 out of 3 nodes are alive, configuration will result in quorum loss", peer, o2)
 		})
 	})
 

integration/raft/migration_test.go

@@ -622,9 +622,7 @@ func checkPeerDeliverRequest(o *nwo.Orderer, submitter *nwo.Peer, network *nwo.N
 }
 
 func updateOrdererConfigFailed(n *nwo.Network, orderer *nwo.Orderer, channel string, current, updated *common.Config, peer *nwo.Peer, additionalSigners ...*nwo.Orderer) {
-	sess := nwo.UpdateOrdererConfigSession(n, orderer, channel, current, updated, peer, additionalSigners...)
-	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(1))
-	Expect(sess.Err).NotTo(gbytes.Say("Successfully submitted channel update"))
+	nwo.UpdateOrdererConfigFails(n, orderer, channel, current, updated, "", peer, additionalSigners...)
 }
 
 func updateOrdererEndpointsConfigFails(n *nwo.Network, orderer *nwo.Orderer, channel string, current, updated *common.Config, peer *nwo.Peer, additionalSigners ...*nwo.Peer) {