Skip to content

Commit a042a1d

Browse files
SaidAltury-ibmmbrandenburger
authored andcommitted
enhancement: implement multiton ListenerManager
Signed-off-by: Said Altury <Said.Altury@ibm.com>
1 parent 169b5ef commit a042a1d

File tree

9 files changed

+1089
-219
lines changed

9 files changed

+1089
-219
lines changed

integration/fabricx/simple/views/create.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@ SPDX-License-Identifier: Apache-2.0
77
package views
88

99
import (
10-
"context"
1110
"encoding/json"
12-
"errors"
1311
"sync"
1412
"time"
1513

1614
"github.com/hyperledger-labs/fabric-smart-client/integration/fabricx/simple/views/utils"
1715
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
18-
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/assert"
1916
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
2017
fdriver "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
2118
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/state"
@@ -76,7 +73,7 @@ func (i *CreateView) Call(viewCtx view.Context) (interface{}, error) {
7673
return nil, err
7774
}
7875

79-
lm, err := finality.GetListenerManager(viewCtx.Context(), viewCtx, network.Name(), ch.Name())
76+
lm, err := finality.GetListenerManager(viewCtx, network.Name(), ch.Name())
8077
if err != nil {
8178
return nil, err
8279
}
@@ -90,13 +87,6 @@ func (i *CreateView) Call(viewCtx view.Context) (interface{}, error) {
9087
return nil, err
9188
}
9289

93-
go func() {
94-
err := lm.Listen(viewCtx.Context())
95-
if err != nil && !errors.Is(err, context.Canceled) {
96-
assert.NoError(err)
97-
}
98-
}()
99-
10090
// now we have a committer listener registered, we send the approved transaction to the orderer
10191
logger.Infof("Submit tx (txID=%v) to ordering service", tx.ID())
10292
if _, err = viewCtx.RunView(state.NewOrderingAndFinalityWithTimeoutView(tx, FinalityTimeout)); err != nil {

platform/fabricx/core/finality/listenermanager.go

Lines changed: 0 additions & 90 deletions
This file was deleted.

platform/fabricx/core/finality/mock/notifier_grpc_client.go

Lines changed: 120 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

platform/fabricx/core/finality/mock/service_provider.go

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)