[FAB-17515] Support configuring BlockValidation policy for orderer group #697
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
caod123
reviewed
Feb 19, 2020
| @@ -109,6 +109,12 @@ func addImplicitMetaPolicyDefaults(cg *cb.ConfigGroup) { | |||
| addPolicy(cg, policies.ImplicitMetaAnyPolicy(channelconfig.WritersPolicyKey), channelconfig.AdminsPolicyKey) | |||
| } | |||
|
|
|||
| // addOrdererImplicitMetaPolicyDefaults adds the orderer's Readers/Writers/Admins/BlockValidation policies, with Any/Any/Majority/Any rules respectively. | |||
| func addOrdererImplicitMetaPolicyDefaults(cg *cb.ConfigGroup) { | |||
| addPolicy(cg, policies.ImplicitMetaAnyPolicy(BlockValidationPolicyKey), channelconfig.AdminsPolicyKey) | |||
There was a problem hiding this comment.
We can't use addPolicy here because it uses the same key name as the sub policy. We can just copy the removed Policies map addition below here
wlahti
force-pushed
the
FAB-17515-release-1.4
branch
2 times, most recently
from
df54c54 to
cfe86cc
Compare
wlahti
force-pushed
the
FAB-17515-release-1.4
branch
from
cfe86cc to
0257000
Compare
caod123
reviewed
Feb 24, 2020
| Expect(cg.Policies["SamplePolicy"]).NotTo(BeNil()) | ||
| Expect(cg.Policies["BlockValidation"]).NotTo(BeNil()) | ||
| Expect(cg.Policies["SamplePolicy"].Policy).To(Equal(expectedAdminPolicy)) |
There was a problem hiding this comment.
Can you convert this inline with protoutil.MarshalOrPanic and remove lines 194-203?
Expect(cg.Policies["SamplePolicy"].Policy).To(Equal(&cb.Policy{
Type: int32(cb.Policy_IMPLICIT_META),
Value: protoutil.MarshalOrPanic(&cb.ImplicitMetaPolicy{
SubPolicy: "Admins",
Rule: cb.ImplicitMetaPolicy_ANY,
}),
}))
0257000 to
af1efde
Compare
|
Opened https://jira.hyperledger.org/browse/FAB-17531 for the UT failure. |
|
Looks like the latest failure is similar to what was fixed in #704 |
Before we used to hardcode the BlockValidation policy to an ImplicitMetaAnyPolicy. Signed-off-by: Danny Cao <dcao@us.ibm.com> Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
wlahti
force-pushed
the
FAB-17515-release-1.4
branch
from
af1efde to
1f98861
Compare
sykesm
reviewed
Feb 25, 2020
Comment on lines
+112
to
+120
| // addOrdererImplicitMetaPolicyDefaults adds the orderer's Readers/Writers/Admins/BlockValidation policies, with Any/Any/Majority/Any rules respectively. | ||
| func addOrdererImplicitMetaPolicyDefaults(cg *cb.ConfigGroup) { | ||
| cg.Policies[BlockValidationPolicyKey] = &cb.ConfigPolicy{ | ||
| Policy: policies.ImplicitMetaAnyPolicy(channelconfig.WritersPolicyKey).Value(), | ||
| ModPolicy: channelconfig.AdminsPolicyKey, | ||
| } | ||
| addImplicitMetaPolicyDefaults(cg) | ||
| } | ||
|
|
There was a problem hiding this comment.
Is there some sort of assertion for this that I'm misssing? Maybe in an existing test?
sykesm
approved these changes
Feb 25, 2020
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.
Type of change
Description
Before we used to hardcode the BlockValidation policy to an ImplicitMetaAnyPolicy and we also did not enforce that the BlockValidation policy existed.
Related issues
FAB-17515