Skip to content

Collapse batchpin.Submitter into multiparty.Manager #880

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 24, 2022
Merged

Collapse batchpin.Submitter into multiparty.Manager #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fc6490
Collapse batchpin.Submitter into multiparty.Manager
awrichar Jun 24, 2022
acc7369
Fix manager initialization order
awrichar Jun 24, 2022
714855c
Add missing RegisterHandler call
awrichar Jun 24, 2022
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
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ $(eval $(call makemock, pkg/tokens, Plugin, tokenmock
$(eval $(call makemock, pkg/tokens, Callbacks, tokenmocks))
$(eval $(call makemock, internal/txcommon, Helper, txcommonmocks))
$(eval $(call makemock, internal/identity, Manager, identitymanagermocks))
$(eval $(call makemock, internal/batchpin, Submitter, batchpinmocks))
$(eval $(call makemock, internal/sysmessaging, SystemEvents, sysmessagingmocks))
$(eval $(call makemock, internal/sysmessaging, MessageSender, sysmessagingmocks))
$(eval $(call makemock, internal/sysmessaging, LocalNodeInfo, sysmessagingmocks))
Expand Down Expand Up @@ -101,4 +100,4 @@ manifest:
docker:
./docker_build.sh $(DOCKER_ARGS)
docs: .ALWAYS
cd docs && bundle install && bundle exec jekyll build && bundle exec htmlproofer --disable-external --allow-hash-href --assume-extension ./_site --url-swap '^/firefly/:/' --url-ignore /127.0.0.1/,/localhost/
cd docs && bundle install && bundle exec jekyll build && bundle exec htmlproofer --disable-external --allow-hash-href --assume-extension ./_site --url-swap '^/firefly/:/' --url-ignore /127.0.0.1/,/localhost/
91 changes: 0 additions & 91 deletions internal/batchpin/batchpin.go
View file
Open in desktop

This file was deleted.

180 changes: 0 additions & 180 deletions internal/batchpin/batchpin_test.go
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions internal/broadcast/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ import (
"github.com/hyperledger/firefly-common/pkg/i18n"
"github.com/hyperledger/firefly-common/pkg/log"
"github.com/hyperledger/firefly/internal/batch"
"github.com/hyperledger/firefly/internal/batchpin"
"github.com/hyperledger/firefly/internal/coreconfig"
"github.com/hyperledger/firefly/internal/coremsgs"
"github.com/hyperledger/firefly/internal/data"
"github.com/hyperledger/firefly/internal/identity"
"github.com/hyperledger/firefly/internal/metrics"
"github.com/hyperledger/firefly/internal/multiparty"
"github.com/hyperledger/firefly/internal/operations"
"github.com/hyperledger/firefly/internal/syncasync"
"github.com/hyperledger/firefly/internal/sysmessaging"
Expand Down Expand Up @@ -70,14 +70,14 @@ type broadcastManager struct {
exchange dataexchange.Plugin
sharedstorage sharedstorage.Plugin
syncasync syncasync.Bridge
batchpin batchpin.Submitter
multiparty multiparty.Manager
maxBatchPayloadLength int64
metrics metrics.Manager
operations operations.Manager
}

func NewBroadcastManager(ctx context.Context, ns string, di database.Plugin, bi blockchain.Plugin, dx dataexchange.Plugin, si sharedstorage.Plugin, im identity.Manager, dm data.Manager, ba batch.Manager, sa syncasync.Bridge, bp batchpin.Submitter, mm metrics.Manager, om operations.Manager) (Manager, error) {
if di == nil || im == nil || dm == nil || bi == nil || dx == nil || si == nil || ba == nil || mm == nil || om == nil {
func NewBroadcastManager(ctx context.Context, ns string, di database.Plugin, bi blockchain.Plugin, dx dataexchange.Plugin, si sharedstorage.Plugin, im identity.Manager, dm data.Manager, ba batch.Manager, sa syncasync.Bridge, mult multiparty.Manager, mm metrics.Manager, om operations.Manager) (Manager, error) {
if di == nil || im == nil || dm == nil || bi == nil || dx == nil || si == nil || ba == nil || mm == nil || om == nil || mult == nil {
return nil, i18n.NewError(ctx, coremsgs.MsgInitializationNilDepError, "BroadcastManager")
}
bm := &broadcastManager{
Expand All @@ -90,7 +90,7 @@ func NewBroadcastManager(ctx context.Context, ns string, di database.Plugin, bi
exchange: dx,
sharedstorage: si,
syncasync: sa,
batchpin: bp,
multiparty: mult,
maxBatchPayloadLength: config.GetByteSize(coreconfig.BroadcastBatchPayloadLimit),
metrics: mm,
operations: om,
Expand Down Expand Up @@ -152,7 +152,7 @@ func (bm *broadcastManager) dispatchBatch(ctx context.Context, state *batch.Disp
}
payloadRef := outputs.GetString("payloadRef")
log.L(ctx).Infof("Pinning broadcast batch %s with author=%s key=%s payloadRef=%s", batch.ID, batch.Author, batch.Key, payloadRef)
return bm.batchpin.SubmitPinnedBatch(ctx, &state.Persisted, state.Pins, payloadRef)
return bm.multiparty.SubmitBatchPin(ctx, &state.Persisted, state.Pins, payloadRef)
}

func (bm *broadcastManager) uploadBlobs(ctx context.Context, tx *fftypes.UUID, data core.DataArray) error {
Expand Down
Loading