Skip to content

Test #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Test #766

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion platform/common/sdk/dig/sdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ package dig

import (
"context"
"errors"

"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
"github.com/hyperledger-labs/fabric-smart-client/pkg/node"
"github.com/hyperledger-labs/fabric-smart-client/platform/view"
"github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
"go.uber.org/dig"
)
Expand All @@ -22,8 +25,33 @@ type SDK interface {
ConfigService() driver.ConfigService
}

type BaseSDK struct{}
type BaseSDK struct {
C *dig.Container
Config *view.ConfigService
}

func (s *BaseSDK) PostStart(context.Context) error { return nil }

func (s *BaseSDK) Stop() error { return nil }

func (s *BaseSDK) Container() *dig.Container { return s.C }

func (s *BaseSDK) ConfigService() driver.ConfigService { return s.Config }

func NewSDK(registry node.Registry) *BaseSDK {
return NewSDKWithContainer(dig.New(), registry)
}

func NewSDKWithContainer(c *dig.Container, registry node.Registry) *BaseSDK {
sdk := &BaseSDK{
C: c,
Config: view.GetConfigService(registry),
}
err := errors.Join(
sdk.C.Provide(func() node.Registry { return registry }),
)
if err != nil {
panic(err)
}
return sdk
}
26 changes: 5 additions & 21 deletions platform/view/sdk/dig/sdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,33 +50,14 @@ var logger = logging.MustGetLogger("view-sdk")

type SDK struct {
*dig2.BaseSDK
C *dig.Container
Config *view.ConfigService
}

func (p *SDK) Container() *dig.Container { return p.C }

func (p *SDK) ConfigService() driver.ConfigService { return p.Config }

func NewSDK(registry node.Registry) *SDK {
return NewSDKWithContainer(dig.New(), registry)
return &SDK{BaseSDK: dig2.NewSDK(registry)}
}

func NewSDKWithContainer(c *dig.Container, registry node.Registry) *SDK {
sdk := &SDK{
C: c,
Config: view.GetConfigService(registry),
}
err := errors.Join(
sdk.C.Provide(func() node.Registry { return registry }),
sdk.C.Provide(digutils.Identity[node.Registry](), dig.As(new(driver.ServiceProvider), new(node.Registry), new(view.ServiceProvider), new(finality.Registry))),
sdk.C.Provide(func() *view.ConfigService { return sdk.Config }),
sdk.C.Provide(digutils.Identity[*view.ConfigService](), dig.As(new(driver.ConfigService), new(id.ConfigProvider), new(endpoint.ConfigService))),
)
if err != nil {
panic(err)
}
return sdk
return &SDK{BaseSDK: dig2.NewSDKWithContainer(c, registry)}
}

type ViewManager interface {
Expand All @@ -86,6 +67,9 @@ type ViewManager interface {

func (p *SDK) Install() error {
err := errors.Join(
p.C.Provide(digutils.Identity[node.Registry](), dig.As(new(driver.ServiceProvider), new(node.Registry), new(view.ServiceProvider), new(finality.Registry))),
p.C.Provide(func() *view.ConfigService { return p.Config }),
p.C.Provide(digutils.Identity[*view.ConfigService](), dig.As(new(driver.ConfigService), new(id.ConfigProvider), new(endpoint.ConfigService))),
p.C.Provide(crypto.NewProvider, dig.As(new(hash.Hasher))),
p.C.Provide(simple.NewEventBus, dig.As(new(events.EventSystem), new(events.Publisher), new(events.Subscriber))),
p.C.Provide(func(system events.EventSystem) *events.Service { return &events.Service{EventSystem: system} }),
Expand Down
Loading