Skip to content

Allow specifying pool by name or ID for transfer requests #320

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 1 commit into from
Nov 18, 2021
Merged

Allow specifying pool by name or ID for transfer requests #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion internal/assets/token_transfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ func (s *transferSender) sendInternal(ctx context.Context, method sendMethod) er

var pool *fftypes.TokenPool
err = s.mgr.database.RunAsGroup(ctx, func(ctx context.Context) (err error) {
pool, err = s.mgr.GetTokenPool(ctx, s.namespace, s.transfer.Connector, s.transfer.Pool)
pool, err = s.mgr.GetTokenPoolByNameOrID(ctx, s.namespace, s.transfer.Pool)
if err != nil {
return err
}
Expand Down
25 changes: 25 additions & 0 deletions internal/assets/token_transfer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,6 +1146,31 @@ func TestTransferTokensByTypeSuccess(t *testing.T) {
mti.AssertExpectations(t)
}

func TestTransferTokensPoolNotFound(t *testing.T) {
am, cancel := newTestAssets(t)
defer cancel()

transfer := &fftypes.TokenTransferInput{
TokenTransfer: fftypes.TokenTransfer{
From: "A",
To: "B",
Amount: *fftypes.NewBigInt(5),
},
Pool: "pool1",
}

mdi := am.database.(*databasemocks.Plugin)
mim := am.identity.(*identitymanagermocks.Manager)
mim.On("GetLocalOrganization", context.Background()).Return(&fftypes.Organization{Identity: "0x12345"}, nil)
mdi.On("GetTokenPool", context.Background(), "ns1", "pool1").Return(nil, nil)

_, err := am.TransferTokens(context.Background(), "ns1", transfer, false)
assert.Regexp(t, "FF10109", err)

mim.AssertExpectations(t)
mdi.AssertExpectations(t)
}

func TestTransferPrepare(t *testing.T) {
am, cancel := newTestAssets(t)
defer cancel()
Expand Down