Skip to content

Commit

Permalink
Move MessageSender interface into syncasync package as Sender
Browse files Browse the repository at this point in the history 
Remove the sysmessaging package.

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
  • Loading branch information
@awrichar
awrichar committed Aug 4, 2022
1 parent 2eedf09 commit 15af0e0
Show file tree
Hide file tree
Showing 29 changed files with 126 additions and 148 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ $(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/sysmessaging, MessageSender, sysmessagingmocks))
$(eval $(call makemock, internal/syncasync, Sender, syncasyncmocks))
$(eval $(call makemock, internal/syncasync, Bridge, syncasyncmocks))
$(eval $(call makemock, internal/data, Manager, datamocks))
$(eval $(call makemock, internal/batch, Manager, batchmocks))
Expand Down
5 changes: 2 additions & 3 deletions internal/assets/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"github.com/hyperledger/firefly/internal/operations"
"github.com/hyperledger/firefly/internal/privatemessaging"
"github.com/hyperledger/firefly/internal/syncasync"
"github.com/hyperledger/firefly/internal/sysmessaging"
"github.com/hyperledger/firefly/internal/txcommon"
"github.com/hyperledger/firefly/pkg/core"
"github.com/hyperledger/firefly/pkg/database"
Expand All @@ -53,14 +52,14 @@ type Manager interface {
GetTokenTransfers(ctx context.Context, filter database.AndFilter) ([]*core.TokenTransfer, *database.FilterResult, error)
GetTokenTransferByID(ctx context.Context, id string) (*core.TokenTransfer, error)

NewTransfer(transfer *core.TokenTransferInput) sysmessaging.MessageSender
NewTransfer(transfer *core.TokenTransferInput) syncasync.Sender
MintTokens(ctx context.Context, transfer *core.TokenTransferInput, waitConfirm bool) (*core.TokenTransfer, error)
BurnTokens(ctx context.Context, transfer *core.TokenTransferInput, waitConfirm bool) (*core.TokenTransfer, error)
TransferTokens(ctx context.Context, transfer *core.TokenTransferInput, waitConfirm bool) (*core.TokenTransfer, error)

GetTokenConnectors(ctx context.Context) []*core.TokenConnector

NewApproval(approve *core.TokenApprovalInput) sysmessaging.MessageSender
NewApproval(approve *core.TokenApprovalInput) syncasync.Sender
TokenApproval(ctx context.Context, approval *core.TokenApprovalInput, waitConfirm bool) (*core.TokenApproval, error)
GetTokenApprovals(ctx context.Context, filter database.AndFilter) ([]*core.TokenApproval, *database.FilterResult, error)

Expand Down
4 changes: 2 additions & 2 deletions internal/assets/token_approval.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/hyperledger/firefly-common/pkg/fftypes"
"github.com/hyperledger/firefly-common/pkg/i18n"
"github.com/hyperledger/firefly/internal/coremsgs"
"github.com/hyperledger/firefly/internal/sysmessaging"
"github.com/hyperledger/firefly/internal/syncasync"
"github.com/hyperledger/firefly/internal/txcommon"
"github.com/hyperledger/firefly/pkg/core"
"github.com/hyperledger/firefly/pkg/database"
Expand Down Expand Up @@ -53,7 +53,7 @@ func (s *approveSender) setDefaults() {
s.approval.LocalID = fftypes.NewUUID()
}

func (am *assetManager) NewApproval(approval *core.TokenApprovalInput) sysmessaging.MessageSender {
func (am *assetManager) NewApproval(approval *core.TokenApprovalInput) syncasync.Sender {
sender := &approveSender{
mgr: am,
approval: approval,
Expand Down
2 changes: 1 addition & 1 deletion internal/assets/token_approval_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ func TestTokenApprovalConfirm(t *testing.T) {

msa.On("WaitForTokenApproval", context.Background(), mock.Anything, mock.Anything).
Run(func(args mock.Arguments) {
send := args[2].(syncasync.RequestSender)
send := args[2].(syncasync.SendFunction)
send(context.Background())
}).
Return(&core.TokenApproval{}, nil)
Expand Down
2 changes: 1 addition & 1 deletion internal/assets/token_pool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ func TestCreateTokenPoolConfirm(t *testing.T) {
mdi.On("InsertOperation", context.Background(), mock.Anything).Return(nil)
msa.On("WaitForTokenPool", context.Background(), mock.Anything, mock.Anything).
Run(func(args mock.Arguments) {
send := args[2].(syncasync.RequestSender)
send := args[2].(syncasync.SendFunction)
send(context.Background())
}).
Return(nil, nil)
Expand Down
8 changes: 4 additions & 4 deletions internal/assets/token_transfer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/hyperledger/firefly-common/pkg/fftypes"
"github.com/hyperledger/firefly-common/pkg/i18n"
"github.com/hyperledger/firefly/internal/coremsgs"
"github.com/hyperledger/firefly/internal/sysmessaging"
"github.com/hyperledger/firefly/internal/syncasync"
"github.com/hyperledger/firefly/internal/txcommon"
"github.com/hyperledger/firefly/pkg/core"
"github.com/hyperledger/firefly/pkg/database"
Expand All @@ -40,7 +40,7 @@ func (am *assetManager) GetTokenTransferByID(ctx context.Context, id string) (*c
return am.database.GetTokenTransferByID(ctx, am.namespace, transferID)
}

func (am *assetManager) NewTransfer(transfer *core.TokenTransferInput) sysmessaging.MessageSender {
func (am *assetManager) NewTransfer(transfer *core.TokenTransferInput) syncasync.Sender {
sender := &transferSender{
mgr: am,
transfer: transfer,
Expand All @@ -53,7 +53,7 @@ type transferSender struct {
mgr *assetManager
transfer *core.TokenTransferInput
resolved bool
msgSender sysmessaging.MessageSender
msgSender syncasync.Sender
}

// sendMethod is the specific operation requested of the transferSender.
Expand Down Expand Up @@ -260,7 +260,7 @@ func (s *transferSender) sendInternal(ctx context.Context, method sendMethod) (e
return err
}

func (s *transferSender) buildTransferMessage(ctx context.Context, in *core.MessageInOut) (sysmessaging.MessageSender, error) {
func (s *transferSender) buildTransferMessage(ctx context.Context, in *core.MessageInOut) (syncasync.Sender, error) {
allowedTypes := []fftypes.FFEnum{
core.MessageTypeTransferBroadcast,
core.MessageTypeTransferPrivate,
Expand Down
21 changes: 10 additions & 11 deletions internal/assets/token_transfer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"github.com/hyperledger/firefly/mocks/operationmocks"
"github.com/hyperledger/firefly/mocks/privatemessagingmocks"
"github.com/hyperledger/firefly/mocks/syncasyncmocks"
"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
"github.com/hyperledger/firefly/mocks/txcommonmocks"
"github.com/hyperledger/firefly/pkg/core"
"github.com/hyperledger/firefly/pkg/database"
Expand Down Expand Up @@ -412,7 +411,7 @@ func TestMintTokensConfirm(t *testing.T) {
mdi.On("InsertOperation", context.Background(), mock.Anything).Return(nil)
msa.On("WaitForTokenTransfer", context.Background(), mock.Anything, mock.Anything).
Run(func(args mock.Arguments) {
send := args[2].(syncasync.RequestSender)
send := args[2].(syncasync.SendFunction)
send(context.Background())
}).
Return(&core.TokenTransfer{}, nil)
Expand Down Expand Up @@ -519,7 +518,7 @@ func TestBurnTokensConfirm(t *testing.T) {
mdi.On("InsertOperation", context.Background(), mock.Anything).Return(nil)
msa.On("WaitForTokenTransfer", context.Background(), mock.Anything, mock.Anything).
Run(func(args mock.Arguments) {
send := args[2].(syncasync.RequestSender)
send := args[2].(syncasync.SendFunction)
send(context.Background())
}).
Return(&core.TokenTransfer{}, nil)
Expand Down Expand Up @@ -724,7 +723,7 @@ func TestTransferTokensWithBroadcastMessage(t *testing.T) {
mdi := am.database.(*databasemocks.Plugin)
mim := am.identity.(*identitymanagermocks.Manager)
mbm := am.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}
mth := am.txHelper.(*txcommonmocks.Helper)
mom := am.operations.(*operationmocks.Manager)
mim.On("NormalizeSigningKey", context.Background(), "", identity.KeyNormalizationBlockchainPlugin).Return("0x12345", nil)
Expand Down Expand Up @@ -820,7 +819,7 @@ func TestTransferTokensWithBroadcastMessageSendFail(t *testing.T) {
mdi := am.database.(*databasemocks.Plugin)
mim := am.identity.(*identitymanagermocks.Manager)
mbm := am.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}
mth := am.txHelper.(*txcommonmocks.Helper)
mom := am.operations.(*operationmocks.Manager)
mim.On("NormalizeSigningKey", context.Background(), "", identity.KeyNormalizationBlockchainPlugin).Return("0x12345", nil)
Expand Down Expand Up @@ -865,7 +864,7 @@ func TestTransferTokensWithBroadcastPrepareFail(t *testing.T) {
}

mbm := am.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}
mbm.On("NewBroadcast", transfer.Message).Return(mms)
mms.On("Prepare", context.Background()).Return(fmt.Errorf("pop"))

Expand Down Expand Up @@ -912,7 +911,7 @@ func TestTransferTokensWithPrivateMessage(t *testing.T) {
mdi := am.database.(*databasemocks.Plugin)
mim := am.identity.(*identitymanagermocks.Manager)
mpm := am.messaging.(*privatemessagingmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}
mth := am.txHelper.(*txcommonmocks.Helper)
mom := am.operations.(*operationmocks.Manager)
mim.On("NormalizeSigningKey", context.Background(), "", identity.KeyNormalizationBlockchainPlugin).Return("0x12345", nil)
Expand Down Expand Up @@ -1031,7 +1030,7 @@ func TestTransferTokensConfirm(t *testing.T) {
mdi.On("InsertOperation", context.Background(), mock.Anything).Return(nil)
msa.On("WaitForTokenTransfer", context.Background(), mock.Anything, mock.Anything).
Run(func(args mock.Arguments) {
send := args[2].(syncasync.RequestSender)
send := args[2].(syncasync.SendFunction)
send(context.Background())
}).
Return(&core.TokenTransfer{}, nil)
Expand Down Expand Up @@ -1085,7 +1084,7 @@ func TestTransferTokensWithBroadcastConfirm(t *testing.T) {
mdi := am.database.(*databasemocks.Plugin)
mim := am.identity.(*identitymanagermocks.Manager)
mbm := am.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}
msa := am.syncasync.(*syncasyncmocks.Bridge)
mth := am.txHelper.(*txcommonmocks.Helper)
mom := am.operations.(*operationmocks.Manager)
Expand All @@ -1098,13 +1097,13 @@ func TestTransferTokensWithBroadcastConfirm(t *testing.T) {
mms.On("Send", context.Background()).Return(nil)
msa.On("WaitForMessage", context.Background(), mock.Anything, mock.Anything).
Run(func(args mock.Arguments) {
send := args[2].(syncasync.RequestSender)
send := args[2].(syncasync.SendFunction)
send(context.Background())
}).
Return(&core.Message{}, nil)
msa.On("WaitForTokenTransfer", context.Background(), mock.Anything, mock.Anything).
Run(func(args mock.Arguments) {
send := args[2].(syncasync.RequestSender)
send := args[2].(syncasync.SendFunction)
send(context.Background())
}).
Return(&transfer.TokenTransfer, nil)
Expand Down
3 changes: 1 addition & 2 deletions internal/broadcast/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
"github.com/hyperledger/firefly/internal/multiparty"
"github.com/hyperledger/firefly/internal/operations"
"github.com/hyperledger/firefly/internal/syncasync"
"github.com/hyperledger/firefly/internal/sysmessaging"
"github.com/hyperledger/firefly/pkg/blockchain"
"github.com/hyperledger/firefly/pkg/core"
"github.com/hyperledger/firefly/pkg/database"
Expand All @@ -45,7 +44,7 @@ const broadcastDispatcherName = "pinned_broadcast"
type Manager interface {
core.Named

NewBroadcast(in *core.MessageInOut) sysmessaging.MessageSender
NewBroadcast(in *core.MessageInOut) syncasync.Sender
BroadcastMessage(ctx context.Context, in *core.MessageInOut, waitConfirm bool) (out *core.Message, err error)
Start() error
WaitStop()
Expand Down
4 changes: 2 additions & 2 deletions internal/broadcast/message.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
"github.com/hyperledger/firefly-common/pkg/log"
"github.com/hyperledger/firefly/internal/coremsgs"
"github.com/hyperledger/firefly/internal/data"
"github.com/hyperledger/firefly/internal/sysmessaging"
"github.com/hyperledger/firefly/internal/syncasync"
"github.com/hyperledger/firefly/pkg/core"
)

func (bm *broadcastManager) NewBroadcast(in *core.MessageInOut) sysmessaging.MessageSender {
func (bm *broadcastManager) NewBroadcast(in *core.MessageInOut) syncasync.Sender {
broadcast := &broadcastSender{
mgr: bm,
msg: &data.NewMessage{
Expand Down
2 changes: 1 addition & 1 deletion internal/broadcast/message_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func TestBroadcastMessageWaitConfirmOk(t *testing.T) {
}
msa.On("WaitForMessage", ctx, mock.Anything, mock.Anything).
Run(func(args mock.Arguments) {
send := args[2].(syncasync.RequestSender)
send := args[2].(syncasync.SendFunction)
send(ctx)
}).
Return(replyMsg, nil)
Expand Down
2 changes: 1 addition & 1 deletion internal/contracts/manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1338,7 +1338,7 @@ func TestInvokeContractConfirm(t *testing.T) {
})).Return(nil, nil)
msa.On("WaitForInvokeOperation", mock.Anything, mock.Anything, mock.Anything).
Run(func(args mock.Arguments) {
send := args[2].(syncasync.RequestSender)
send := args[2].(syncasync.SendFunction)
send(context.Background())
}).
Return(&core.Operation{}, nil)
Expand Down
6 changes: 3 additions & 3 deletions internal/definitions/sender_contracts_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/hyperledger/firefly/mocks/broadcastmocks"
"github.com/hyperledger/firefly/mocks/contractmocks"
"github.com/hyperledger/firefly/mocks/identitymanagermocks"
"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
"github.com/hyperledger/firefly/mocks/syncasyncmocks"
"github.com/hyperledger/firefly/pkg/core"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down Expand Up @@ -84,7 +84,7 @@ func TestDefineFFIOk(t *testing.T) {
mim.On("ResolveInputSigningIdentity", context.Background(), mock.Anything).Return(nil)

mbm := ds.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}
mbm.On("NewBroadcast", mock.Anything).Return(mms)
mms.On("Send", context.Background()).Return(nil)

Expand Down Expand Up @@ -160,7 +160,7 @@ func TestDefineContractAPIOk(t *testing.T) {
mim.On("ResolveInputSigningIdentity", context.Background(), mock.Anything).Return(nil)

mbm := ds.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}
mbm.On("NewBroadcast", mock.Anything).Return(mms)
mms.On("Send", context.Background()).Return(nil)

Expand Down
4 changes: 2 additions & 2 deletions internal/definitions/sender_datatype_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/hyperledger/firefly/mocks/broadcastmocks"
"github.com/hyperledger/firefly/mocks/datamocks"
"github.com/hyperledger/firefly/mocks/identitymanagermocks"
"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
"github.com/hyperledger/firefly/mocks/syncasyncmocks"
"github.com/hyperledger/firefly/pkg/core"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down Expand Up @@ -89,7 +89,7 @@ func TestBroadcastOk(t *testing.T) {
mdm := ds.data.(*datamocks.Manager)
mim := ds.identity.(*identitymanagermocks.Manager)
mbm := ds.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}

mim.On("ResolveInputSigningIdentity", mock.Anything, mock.Anything).Return(nil)
mdm.On("CheckDatatype", mock.Anything, mock.Anything).Return(nil)
Expand Down
16 changes: 8 additions & 8 deletions internal/definitions/sender_identity_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/hyperledger/firefly/internal/identity"
"github.com/hyperledger/firefly/mocks/broadcastmocks"
"github.com/hyperledger/firefly/mocks/identitymanagermocks"
"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
"github.com/hyperledger/firefly/mocks/syncasyncmocks"
"github.com/hyperledger/firefly/pkg/core"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand All @@ -35,7 +35,7 @@ func TestClaimIdentity(t *testing.T) {

mim := ds.identity.(*identitymanagermocks.Manager)
mbm := ds.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}

mim.On("NormalizeSigningKey", mock.Anything, "0x1234", identity.KeyNormalizationBlockchainPlugin).Return("", nil)
mbm.On("NewBroadcast", mock.Anything).Return(mms)
Expand All @@ -61,7 +61,7 @@ func TestClaimIdentityFail(t *testing.T) {

mim := ds.identity.(*identitymanagermocks.Manager)
mbm := ds.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}

mim.On("NormalizeSigningKey", mock.Anything, "0x1234", identity.KeyNormalizationBlockchainPlugin).Return("", nil)
mbm.On("NewBroadcast", mock.Anything).Return(mms)
Expand Down Expand Up @@ -107,8 +107,8 @@ func TestClaimIdentityChild(t *testing.T) {

mim := ds.identity.(*identitymanagermocks.Manager)
mbm := ds.broadcast.(*broadcastmocks.Manager)
mms1 := &sysmessagingmocks.MessageSender{}
mms2 := &sysmessagingmocks.MessageSender{}
mms1 := &syncasyncmocks.Sender{}
mms2 := &syncasyncmocks.Sender{}

mim.On("NormalizeSigningKey", mock.Anything, "0x1234", identity.KeyNormalizationBlockchainPlugin).Return("", nil)
mbm.On("NewBroadcast", mock.Anything).Return(mms1).Once()
Expand Down Expand Up @@ -141,8 +141,8 @@ func TestClaimIdentityChildFail(t *testing.T) {

mim := ds.identity.(*identitymanagermocks.Manager)
mbm := ds.broadcast.(*broadcastmocks.Manager)
mms1 := &sysmessagingmocks.MessageSender{}
mms2 := &sysmessagingmocks.MessageSender{}
mms1 := &syncasyncmocks.Sender{}
mms2 := &syncasyncmocks.Sender{}

mim.On("NormalizeSigningKey", mock.Anything, "0x1234", identity.KeyNormalizationBlockchainPlugin).Return("", nil)
mbm.On("NewBroadcast", mock.Anything).Return(mms1).Once()
Expand Down Expand Up @@ -195,7 +195,7 @@ func TestUpdateIdentity(t *testing.T) {

mim := ds.identity.(*identitymanagermocks.Manager)
mbm := ds.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}

mbm.On("NewBroadcast", mock.Anything).Return(mms)
mms.On("Send", mock.Anything).Return(nil)
Expand Down
6 changes: 3 additions & 3 deletions internal/definitions/sender_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/hyperledger/firefly/mocks/dataexchangemocks"
"github.com/hyperledger/firefly/mocks/datamocks"
"github.com/hyperledger/firefly/mocks/identitymanagermocks"
"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
"github.com/hyperledger/firefly/mocks/syncasyncmocks"
"github.com/hyperledger/firefly/pkg/core"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down Expand Up @@ -70,7 +70,7 @@ func TestCreateDefinitionConfirm(t *testing.T) {

mim := ds.identity.(*identitymanagermocks.Manager)
mbm := ds.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}

mim.On("ResolveInputSigningIdentity", mock.Anything, mock.Anything).Return(nil)
mbm.On("NewBroadcast", mock.Anything).Return(mms)
Expand All @@ -91,7 +91,7 @@ func TestCreateDatatypeDefinitionAsNodeConfirm(t *testing.T) {

mim := ds.identity.(*identitymanagermocks.Manager)
mbm := ds.broadcast.(*broadcastmocks.Manager)
mms := &sysmessagingmocks.MessageSender{}
mms := &syncasyncmocks.Sender{}

mim.On("ResolveInputSigningIdentity", mock.Anything, mock.Anything).Return(nil)
mbm.On("NewBroadcast", mock.Anything).Return(mms)
Expand Down
Loading

0 comments on commit 15af0e0

Please sign in to comment.