Skip to content

Commit

Permalink
Fixup consenter id type (#3591)
Browse files Browse the repository at this point in the history
Pull in updated proto definition and fix type for consenter id

Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>

Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
  • Loading branch information
andrew-coleman authored Aug 16, 2022
1 parent f292572 commit 25af933
Show file tree
Hide file tree
Showing 7 changed files with 170 additions and 110 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/hyperledger/fabric-chaincode-go v0.0.0-20220713164125-8f0791c989d7
github.com/hyperledger/fabric-config v0.1.0
github.com/hyperledger/fabric-lib-go v1.0.0
github.com/hyperledger/fabric-protos-go v0.0.0-20220815092648-0f59e8aa9f38
github.com/hyperledger/fabric-protos-go v0.0.0-20220816110612-c96c610ca7b4
github.com/kr/pretty v0.3.0
github.com/miekg/pkcs11 v1.1.1
github.com/mitchellh/mapstructure v1.4.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ github.com/hyperledger/fabric-lib-go v1.0.0/go.mod h1:H362nMlunurmHwkYqR5uHL2UDW
github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
github.com/hyperledger/fabric-protos-go v0.0.0-20210911123859-041d13f0980c/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
github.com/hyperledger/fabric-protos-go v0.0.0-20220516090339-9685156fada6/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
github.com/hyperledger/fabric-protos-go v0.0.0-20220815092648-0f59e8aa9f38 h1:y7YZy/nKOKCDRDoVXU7N0OjEbYTbKrI4tW96CLPFiaA=
github.com/hyperledger/fabric-protos-go v0.0.0-20220815092648-0f59e8aa9f38/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
github.com/hyperledger/fabric-protos-go v0.0.0-20220816110612-c96c610ca7b4 h1:Qnr6br3+v284e1pKJ2Nzj2G1sbTMVn4+hi53GS/v1Jw=
github.com/hyperledger/fabric-protos-go v0.0.0-20220816110612-c96c610ca7b4/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
Expand Down
4 changes: 2 additions & 2 deletions internal/configtxgen/encoder/encoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,10 @@ var _ = Describe("Encoder", func() {
Expect(err).NotTo(HaveOccurred())
Expect(len(orderersType.ConsenterMapping)).To(Equal(2))
consenter1 := orderersType.ConsenterMapping[0]
Expect(consenter1.Id).To(Equal(uint64(1)))
Expect(consenter1.Id).To(Equal(uint32(1)))
Expect(consenter1.ClientTlsCert).To(BeNil())
consenter2 := orderersType.ConsenterMapping[1]
Expect(consenter2.Id).To(Equal(uint64(2)))
Expect(consenter2.Id).To(Equal(uint32(2)))
Expect(consenter2.ClientTlsCert).ToNot(BeNil())
})
})
Expand Down
2 changes: 1 addition & 1 deletion internal/configtxgen/genesisconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ type BatchSize struct {
}

type Consenter struct {
ID uint64 `yaml:"ID"`
ID uint32 `yaml:"ID"`
Host string `yaml:"Host"`
Port uint32 `yaml:"Port"`
MSPID string `yaml:"MSPID"`
Expand Down
214 changes: 137 additions & 77 deletions vendor/github.com/hyperledger/fabric-protos-go/common/common.pb.go

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ github.com/hyperledger/fabric-config/protolator/protoext/peerext
# github.com/hyperledger/fabric-lib-go v1.0.0
## explicit
github.com/hyperledger/fabric-lib-go/healthz
# github.com/hyperledger/fabric-protos-go v0.0.0-20220815092648-0f59e8aa9f38
# github.com/hyperledger/fabric-protos-go v0.0.0-20220816110612-c96c610ca7b4
## explicit; go 1.12
github.com/hyperledger/fabric-protos-go/common
github.com/hyperledger/fabric-protos-go/discovery
Expand Down

0 comments on commit 25af933

Please sign in to comment.