updated dependency from github.com/hyperledger/fabric-protos-go v0.3.0 to to github.com/hyperledger/fabric-protos-go-apiv2 v0.3.0 #83
Conversation
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
…0 to github.com/hyperledger/fabric-protos-go-apiv2 v0.3.0
This commit contains dependency update from fabric-protos-go to fabric-protos-go-apiv2 (Resolves hyperledger#80) and "github.com/golang/protobuf"(deprecated) to "google.golang.org/protobuf". The changes in this commit are localised in the "shim folder" only and they include: "github.com/golang/protobuf/proto" --> "google.golang.org/protobuf/proto" pb "github.com/hyperledger/fabric-protos-go/peer" --> pb "github.com/hyperledger/fabric-protos-go-apiv2/peer" "github.com/golang/protobuf/ptypes/timestamp" --> timestamp "google.golang.org/protobuf/types/known/timestamppb" "github.com/hyperledger/fabric-protos-go/ledger/queryresult" --> "github.com/hyperledger/fabric-protos-go-apiv2/ledger/queryresult" peerpb "github.com/hyperledger/fabric-protos-go/peer" --> peerpb "github.com/hyperledger/fabric-protos-go-apiv2/peer" "github.com/hyperledger/fabric-protos-go/common" --> "github.com/hyperledger/fabric-protos-go-apiv2/common" now := ptypes.TimestampNow() --> now := timestamp.Now() Import aliases are kept as it was so as not to affect the source code. I believe that are as far as the shim folder dependency is concerned. Signed-off-by: tobigiwa <giwaoluwatobi@gmail.com>
Signed-off-by: tobigiwa <giwaoluwatobi@gmail.com> This commit contains dependency update from fabric-protos-go to fabric-protos-go-apiv2 (Resolves hyperledger#80) and "github.com/golang/protobuf"(deprecated) to "google.golang.org/protobuf". The changes in this commit are localised in the "shim folder" only and they include: "github.com/golang/protobuf/proto" --> "google.golang.org/protobuf/proto"# pb "github.com/hyperledger/fabric-protos-go/peer" --> pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"# "github.com/golang/protobuf/ptypes/timestamp" --> timestamp "google.golang.org/protobuf/types/known/timestamppb"# "github.com/hyperledger/fabric-protos-go/ledger/queryresult" --> "github.com/hyperledger/fabric-protos-go-apiv2/ledger/queryresult" peerpb "github.com/hyperledger/fabric-protos-go/peer" --> peerpb "github.com/hyperledger/fabric-protos-go-apiv2/peer" "github.com/hyperledger/fabric-protos-go/common" --> "github.com/hyperledger/fabric-protos-go-apiv2/common" now := ptypes.TimestampNow() --> now := timestamp.Now() Import aliases are kept as it was so as not to affect the source code. I believe that are as far as the shim folder dependency is concerned.
Signed-off-by: tobigiwa <giwaoluwatobi@gmail.com> This commit contains dependency update from fabric-protos-go to fabric-protos-go-apiv2 (Resolves hyperledger#80) and "github.com/golang/protobuf"(deprecated) to "google.golang.org/protobuf". The changes in this commit are localised in the "pkg folder" only and they include: "github.com/golang/protobuf/proto" --> "google.golang.org/protobuf/proto"# (use "git push" to publish your local commits) pb "github.com/hyperledger/fabric-protos-go/peer" --> pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"# "github.com/hyperledger/fabric-protos-go/ledger/msp" --> "github.com/hyperledger/fabric-protos-go-apiv2/ledger/msp" "github.com/hyperledger/fabric-protos-go/common" --> "github.com/hyperledger/fabric-protos-go-apiv2/common" Import aliases are kept as it was so as not to affect the source code. I believe that are as far as the pkg folder dependency is concerned.
Removed deprecated package as direct dependency("github.com/golang/protobuf") and bumped up "github.com/hyperledger/fabric-protos-go" to github.com/hyperledger/fabric-protos-go-apiv2. Ran `go get -u github.com/hyperledger/fabric-protos-go@none` and ran `go mod tidy`. It can be noticed that package "github.com/golang/protobuf" is still an indirect dependency used by google.golang.org/grpc/credentials v1.53.0, even the latest update v1.58.0 still does. This issue is from hyperledger#80.
Signed-off-by: tobigiwa <giwaoluwatobi@gmail.com>
changes: 1) The "AssertProtoEqual" was borrowed from: // https://github.com/hyperledger/fabric-gateway/blob/cd1bc1f3fcf007bd97244120d9a8d112153322cd/pkg/internal/test/transaction.go#L20-L22 which is more apt to test the protobufs of google.golang.org/protobuf/ implementation. 2) Also, added "\u00a0" has it was produced from the unmarshling of two functions Finally, Resolves hyperledger#80. Signed-off-by: tobigiwa <giwaoluwatobi@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #80