-
Notifications
You must be signed in to change notification settings - Fork 8.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FAB-4265] Fix overloaded peer channel create cmd
The peer channel create command is currently being used in the e2e tests to perform a configuration update. This is very unintuitive and gives the wrong impression to anyone looking at the e2e example. This CR simply adds an 'update' command to peer channel to make the operation more clear. Change-Id: I33244affb5cd013ca878123b2bd7c8b2c00690b6 Signed-off-by: Jason Yellick <[email protected]>
- Loading branch information
Jason Yellick
committed
Jun 1, 2017
1 parent
389ff3e
commit 531de02
Showing
6 changed files
with
249 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| Copyright IBM Corp. 2017 All Rights Reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package channel | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io/ioutil" | ||
|
|
||
| "errors" | ||
|
|
||
| "github.com/hyperledger/fabric/peer/common" | ||
| "github.com/hyperledger/fabric/protos/utils" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| func updateCmd(cf *ChannelCmdFactory) *cobra.Command { | ||
| updateCmd := &cobra.Command{ | ||
| Use: "update", | ||
| Short: "Send a configtx update.", | ||
| Long: "Signs and sends the supplied configtx update file to the channel. Requires '-f', '-o', '-c'.", | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| return update(cmd, args, cf) | ||
| }, | ||
| } | ||
|
|
||
| return updateCmd | ||
| } | ||
|
|
||
| func update(cmd *cobra.Command, args []string, cf *ChannelCmdFactory) error { | ||
| //the global chainID filled by the "-c" command | ||
| if chainID == common.UndefinedParamValue { | ||
| return errors.New("Must supply channel ID") | ||
| } | ||
|
|
||
| if channelTxFile == "" { | ||
| return InvalidCreateTx("No configtx file name supplied") | ||
| } | ||
|
|
||
| var err error | ||
| if cf == nil { | ||
| cf, err = InitCmdFactory(EndorserNotRequired, OrdererRequired) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| fileData, err := ioutil.ReadFile(channelTxFile) | ||
| if err != nil { | ||
| return ConfigTxFileNotFound(err.Error()) | ||
| } | ||
|
|
||
| ctxEnv, err := utils.UnmarshalEnvelope(fileData) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| sCtxEnv, err := sanityCheckAndSignConfigTx(ctxEnv) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| var broadcastClient common.BroadcastClient | ||
| broadcastClient, err = cf.BroadcastFactory() | ||
| if err != nil { | ||
| return fmt.Errorf("Error getting broadcast client: %s", err) | ||
| } | ||
|
|
||
| defer broadcastClient.Close() | ||
| return broadcastClient.Send(sCtxEnv) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| /* | ||
| Copyright IBM Corp. 2017 All Rights Reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package channel | ||
|
|
||
| import ( | ||
| "io/ioutil" | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/hyperledger/fabric/peer/common" | ||
| cb "github.com/hyperledger/fabric/protos/common" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestUpdateChannel(t *testing.T) { | ||
| InitMSP() | ||
|
|
||
| dir, err := ioutil.TempDir("/tmp", "createinvaltest-") | ||
| if err != nil { | ||
| t.Fatalf("couldn't create temp dir") | ||
| } | ||
| defer os.RemoveAll(dir) // clean up | ||
|
|
||
| mockchannel := "mockchannel" | ||
|
|
||
| configtxFile := filepath.Join(dir, mockchannel) | ||
| if _, err = createTxFile(configtxFile, cb.HeaderType_CONFIG_UPDATE, mockchannel); err != nil { | ||
| t.Fatalf("couldn't create tx file") | ||
| } | ||
|
|
||
| signer, err := common.GetDefaultSigner() | ||
| if err != nil { | ||
| t.Fatalf("Get default signer error: %v", err) | ||
| } | ||
|
|
||
| mockCF := &ChannelCmdFactory{ | ||
| BroadcastFactory: mockBroadcastClientFactory, | ||
| Signer: signer, | ||
| DeliverClient: &mockDeliverClient{}, | ||
| } | ||
|
|
||
| cmd := updateCmd(mockCF) | ||
|
|
||
| AddFlags(cmd) | ||
|
|
||
| args := []string{"-c", mockchannel, "-f", configtxFile, "-o", "localhost:7050"} | ||
| cmd.SetArgs(args) | ||
|
|
||
| assert.NoError(t, cmd.Execute()) | ||
| } | ||
|
|
||
| func TestUpdateChannelMissingConfigTxFlag(t *testing.T) { | ||
| InitMSP() | ||
| mockchannel := "mockchannel" | ||
|
|
||
| signer, err := common.GetDefaultSigner() | ||
| if err != nil { | ||
| t.Fatalf("Get default signer error: %v", err) | ||
| } | ||
|
|
||
| mockCF := &ChannelCmdFactory{ | ||
| BroadcastFactory: mockBroadcastClientFactory, | ||
| Signer: signer, | ||
| DeliverClient: &mockDeliverClient{}, | ||
| } | ||
|
|
||
| cmd := updateCmd(mockCF) | ||
|
|
||
| AddFlags(cmd) | ||
|
|
||
| args := []string{"-c", mockchannel, "-o", "localhost:7050"} | ||
| cmd.SetArgs(args) | ||
|
|
||
| assert.Error(t, cmd.Execute()) | ||
| } | ||
|
|
||
| func TestUpdateChannelMissingConfigTxFile(t *testing.T) { | ||
| InitMSP() | ||
| mockchannel := "mockchannel" | ||
|
|
||
| signer, err := common.GetDefaultSigner() | ||
| if err != nil { | ||
| t.Fatalf("Get default signer error: %v", err) | ||
| } | ||
|
|
||
| mockCF := &ChannelCmdFactory{ | ||
| BroadcastFactory: mockBroadcastClientFactory, | ||
| Signer: signer, | ||
| DeliverClient: &mockDeliverClient{}, | ||
| } | ||
|
|
||
| cmd := createCmd(mockCF) | ||
|
|
||
| AddFlags(cmd) | ||
|
|
||
| args := []string{"-c", mockchannel, "-f", "Non-existant", "-o", "localhost:7050"} | ||
| cmd.SetArgs(args) | ||
|
|
||
| assert.Error(t, cmd.Execute()) | ||
| } | ||
|
|
||
| func TestUpdateChannelMissingChannelID(t *testing.T) { | ||
| InitMSP() | ||
|
|
||
| dir, err := ioutil.TempDir("/tmp", "createinvaltest-") | ||
| if err != nil { | ||
| t.Fatalf("couldn't create temp dir") | ||
| } | ||
| defer os.RemoveAll(dir) // clean up | ||
|
|
||
| mockchannel := "mockchannel" | ||
|
|
||
| configtxFile := filepath.Join(dir, mockchannel) | ||
| if _, err = createTxFile(configtxFile, cb.HeaderType_CONFIG_UPDATE, mockchannel); err != nil { | ||
| t.Fatalf("couldn't create tx file") | ||
| } | ||
|
|
||
| signer, err := common.GetDefaultSigner() | ||
| if err != nil { | ||
| t.Fatalf("Get default signer error: %v", err) | ||
| } | ||
|
|
||
| mockCF := &ChannelCmdFactory{ | ||
| BroadcastFactory: mockBroadcastClientFactory, | ||
| Signer: signer, | ||
| DeliverClient: &mockDeliverClient{}, | ||
| } | ||
|
|
||
| cmd := updateCmd(mockCF) | ||
|
|
||
| AddFlags(cmd) | ||
|
|
||
| args := []string{"-f", configtxFile, "-o", "localhost:7050"} | ||
| cmd.SetArgs(args) | ||
|
|
||
| assert.Error(t, cmd.Execute()) | ||
| } |