FABGW-20 Implement TargetOrgs for Evaluate() #2642
Merged
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
manish-sethi
reviewed
Jun 7, 2021
internal/pkg/gateway/registry.go
Outdated
Comment on lines
160
to
179
| if contains(endorsingOrgs, endorser.mspid) && member.Properties != nil { | ||
| for _, installedChaincode := range member.Properties.Chaincodes { | ||
| // only consider the peers that have our chaincode installed | ||
| if installedChaincode.Name == chaincode { | ||
| endorsersByOrg[endorser.mspid] = append(endorsersByOrg[endorser.mspid], &endorserState{endorser: endorser, height: member.Properties.LedgerHeight}) | ||
| } | ||
| for _, installedChaincode := range member.Properties.Chaincodes { |
There was a problem hiding this comment.
In the existing code, there was a nil check for member.Properties. This patch removed that check. If the intention was to take advantage of the built-in nil check in the protobuf library code, you need to use the function GetChaincodes instead of accessing the field directly.
There was a problem hiding this comment.
good suggestion, thank you
There was a problem hiding this comment.
It may be better to add a UT for this situation if it's simple enough, so a test failure could have caught it. You can do that in a separate PR.
- Implement the TargetOrganizations grpc option for the Evaluate() method. - Rewrite logic of Evaluate() to prefer querying the local org Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
manish-sethi
approved these changes
Jun 7, 2021
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.
Signed-off-by: andrew-coleman andrew_coleman@uk.ibm.com