Allow the peer delivery client to select policy #4856
Conversation
semil
force-pushed
the
issue-4847
branch
2 times, most recently
from
b7416c0
to
aebff31
Compare
There was a problem hiding this comment.
Looks good overall. Just a few minor comments.
We'll need to add an integration test that checks that this indeed works (another PR). We can use the same approach is in the orderer.ReplicationPolicy: copy a simple test from the smartbft test suite (that uses a peer) and simply change to Policy="simple".
core/deliverservice/config.go
Outdated
| @@ -52,6 +54,7 @@ type DeliverServiceConfig struct { | |||
| // OrdererEndpointOverrides is a map of orderer addresses which should be | |||
| // re-mapped to a different orderer endpoint. | |||
| OrdererEndpointOverrides map[string]*orderers.Endpoint | |||
| Policy string | |||
There was a problem hiding this comment.
Add comment with an explanation, same as in the yaml file.
| case "BFT": | ||
| d.blockDeliverer, err = d.createBlockDelivererBFT(chainID, ledgerInfo) | ||
| switch d.conf.DeliverServiceConfig.Policy { | ||
| case "cluster", "": |
There was a problem hiding this comment.
at this stage the policy should not be "", as we det the default "cluster" much earlier.
There was a problem hiding this comment.
it is needed for the unit tests, they do not go through the code that "patches" this case, so we need the code here in the delivery client itself.
There was a problem hiding this comment.
Yes, but it unit test you should check that if the policy is not set you get an error... IMO
| if createCftDeliverer { | ||
| d.blockDeliverer, err = d.createBlockDelivererCFT(chainID, ledgerInfo) | ||
| } |
There was a problem hiding this comment.
why not simply call this function from 2 places? it will save 4 line of code, no? (and would be more readable in my opinion).
semil
force-pushed
the
issue-4847
branch
2 times, most recently
from
fa34b0a
to
2f799e2
Compare
tock-ibm
force-pushed
the
issue-4847
branch
2 times, most recently
from
b77e65d
to
a3987ba
Compare
…Delivere Signed-off-by: Emil Elizarov <emil.elizarov@ibm.com>
Signed-off-by: Yoav Tock <tock@il.ibm.com>
Type of change
Description
Issue: #4847
Related issues
#4847