network service improvements #847
Conversation
Signed-off-by: Angelo De Caro <[email protected]>
adecaro
force-pushed
the
f-new-network
branch
from
374747e to
38a48b3
Compare
Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
integration/ports.go
Outdated
| @@ -60,8 +60,8 @@ var ( | |||
|
|
|||
| AllTestTypes = []*InfrastructureType{ | |||
| WebSocketNoReplication, | |||
| LibP2PNoReplication, | |||
| WebSocketWithReplication, | |||
| // LibP2PNoReplication, | |||
| defer close(ch) | ||
|
|
||
| // group keys by namespace | ||
| keysByNS := map[driver2.Namespace][]string{} |
There was a problem hiding this comment.
use PKey to have some context
| // group keys by namespace | ||
| keysByNS := map[driver2.Namespace][]string{} | ||
| for k, v := range evicted { | ||
| ns := v[0].Namespace() |
There was a problem hiding this comment.
ns := slices.GetAny(v).Namespace()
| // we are abusing TxID to carry the name of the keys we are looking for. | ||
| // Keys are supposed to be unique | ||
| keys := collections.Keys(evicted) // These are the state keys we are looking for | ||
| results := collections.NewSet(keys...) |
There was a problem hiding this comment.
Why do we create the results here and not in queryByID?
| Channel *fabric.Channel | ||
| } | ||
|
|
||
| func (q *DeliveryScanQueryByID) QueryByID(ctx context.Context, lastBlock driver2.BlockNum, evicted map[driver2.TxID][]finality.ListenerEntry[TxInfo]) (<-chan []TxInfo, error) { |
There was a problem hiding this comment.
We can call this startBlock
| return ch, nil | ||
| } | ||
|
|
||
| func (q *DeliveryScanQueryByID) queryByID(ctx context.Context, results collections.Set[string], ch chan []TxInfo, lastBlock uint64, evicted map[driver2.TxID][]finality.ListenerEntry[TxInfo]) { |
There was a problem hiding this comment.
We can call it chaincodeScan or chaincodeDeliveryScan instead of deliveryScan. to distinguish it from th other implementation that only uses the delivery service
| return ch, nil | ||
| } | ||
|
|
||
| func (q *DeliveryScanQueryByID) queryByID(ctx context.Context, results collections.Set[string], ch chan []TxInfo, lastBlock uint64, evicted map[driver2.TxID][]finality.ListenerEntry[TxInfo]) { |
There was a problem hiding this comment.
Do we need to use the generic TxInfo? This service is only applicable for the specific txInfo struct and you don't need to expose Namespace() for this.
| return ch, nil | ||
| } | ||
|
|
||
| func (q *DeliveryScanQueryByID) queryByID(ctx context.Context, results collections.Set[string], ch chan []TxInfo, lastBlock uint64, evicted map[driver2.TxID][]finality.ListenerEntry[TxInfo]) { |
There was a problem hiding this comment.
results is a confusing name. lets call it remainingKeys or something similar
| logger.Errorf("failed unmarshalling results for query by ids [%v]: [%s]", keys, err) | ||
| return | ||
| } | ||
| infos := make([]TxInfo, 0, len(values)) |
There was a problem hiding this comment.
we can call them found and notFound to make it a bit more clear.
| } | ||
|
|
||
| if startDelivery { | ||
| startingBlock := finality.MaxUint64(1, lastBlock-10) |
There was a problem hiding this comment.
We should make a constant
Signed-off-by: Angelo De Caro <[email protected]>
This PR does the following: