remove unused parameters from config block#113
Conversation
669b89d to
4dd70d8
Compare
Signed-off-by: Senthilnathan <cendhu@gmail.com>
4dd70d8 to
d971c17
Compare
liran-funaro
left a comment
There was a problem hiding this comment.
LGTM. @tock-ibm should also review.
I'm only worried that removing the ACL will remove the only reference we have for the upcoming ACL work. But we can always look it up in Fabric.
Yes, we can refer the Fabric code. This PR retains the ACL core library and removes only the usage. |
| } | ||
|
|
||
| bftEnabled := bundle.ChannelConfig().Capabilities().ConsensusTypeBFT() | ||
| cfg, ok := bundle.OrdererConfig() |
There was a problem hiding this comment.
check the ok and if it is false emit an error like in the original code err := errors.New("no orderer section in config block")
There was a problem hiding this comment.
Fixed. Added ok check — returns error "no orderer section in config block" when OrdererConfig() returns false. See e4a448f.
| if len(conf.Addresses) > 0 && channelCapabilities["V3_0"] { | ||
| return nil, errors.Errorf("global orderer endpoints exist, but can not be used with V3_0 capability: %v", conf.Addresses) | ||
| } |
There was a problem hiding this comment.
remove this V3_0 check as well, make sure there are no global endpoints regardless
There was a problem hiding this comment.
Fixed. Removed V3_0 capability check — global orderer endpoints are now rejected unconditionally. Also removed V3_0 gating in NewOrdererOrgGroup — missing org endpoints are now always an error. Kept channelCapabilities parameter in both signatures for future reuse. See e4a448f.
- Check ok from OrdererConfig() and return error when false
('no orderer section in config block')
- Remove V3_0 capability gating: reject global orderer endpoints
unconditionally in NewOrdererGroup
- Remove V3_0 capability gating: require org endpoints unconditionally
in NewOrdererOrgGroup
- Keep channelCapabilities parameter for future reuse
- Update tests for new unconditional validation behavior
Signed-off-by: Senthilnathan <cendhu@gmail.com>
- Check ok from OrdererConfig() and return error when false
('no orderer section in config block')
- Remove V3_0 capability gating: reject global orderer endpoints
unconditionally in NewOrdererGroup
- Remove V3_0 capability gating: require org endpoints unconditionally
in NewOrdererOrgGroup
- Keep channelCapabilities parameter for future reuse
- Update tests for new unconditional validation behavior
Signed-off-by: Senthilnathan <cendhu@gmail.com>
e4a448f to
85447af
Compare
Type of change
Description
Remove legacy Fabric ACLs and no-capability gates
Additional details (Optional)
Related issues