Skip to content

Commit fc74f91

Browse files
fixup! Register optional dig dependency
Signed-off-by: Alexandros Filios <[email protected]>
1 parent 0f8e220 commit fc74f91

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

Diff for: node/node.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
1515
node3 "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
1616
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
17-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
1817
sdk "github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/dig"
1918
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
2019
"github.com/spf13/cobra"
@@ -40,7 +39,7 @@ type FabricSmartClient interface {
4039
RegisterViewManager(manager node3.ViewManager)
4140

4241
// RegisterViewRegistry injects the ViewRegistry dependency
43-
RegisterViewRegistry(registry driver.Registry)
42+
RegisterViewRegistry(registry node3.ViewRegistry)
4443
}
4544

4645
type node struct {

Diff for: pkg/node/node.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515

1616
"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
1717
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
18+
view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view"
1819
"github.com/hyperledger-labs/fabric-smart-client/platform/view/core/config"
19-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
2020
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/registry"
2121
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
2222
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
@@ -33,6 +33,12 @@ var logger = logging.MustGetLogger("fsc")
3333

3434
type ExecuteCallbackFunc = func() error
3535

36+
type ViewRegistry interface {
37+
RegisterFactory(id string, factory view2.Factory) error
38+
RegisterResponder(responder view2.View, initiatedBy interface{}) error
39+
RegisterResponderWithIdentity(responder view2.View, id view.Identity, initiatedBy interface{}) error
40+
}
41+
3642
type ViewManager interface {
3743
NewView(id string, in []byte) (view.View, error)
3844
InitiateView(view view.View, ctx context.Context) (interface{}, error)
@@ -66,7 +72,7 @@ type node struct {
6672
running bool
6773
tracer trace.Tracer
6874
viewManager ViewManager
69-
viewRegistry driver.Registry
75+
viewRegistry ViewRegistry
7076
}
7177

7278
func NewEmpty(confPath string) *node {
@@ -99,7 +105,7 @@ func (n *node) RegisterViewManager(manager ViewManager) {
99105
n.viewManager = manager
100106
}
101107

102-
func (n *node) RegisterViewRegistry(registry driver.Registry) {
108+
func (n *node) RegisterViewRegistry(registry ViewRegistry) {
103109
n.viewRegistry = registry
104110
}
105111

Diff for: platform/view/sdk/dig/sdk.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ type SDK struct {
5656
type nodeRegistry interface {
5757
node.Registry
5858
RegisterViewManager(manager node.ViewManager)
59-
RegisterViewRegistry(registry *view.Registry)
59+
RegisterViewRegistry(registry node.ViewRegistry)
6060
}
6161

6262
func NewSDKFromContainer(c dig2.Container, registry node.Registry) *SDK {

0 commit comments

Comments
 (0)