From c7f3c1a90fc6f61b4a67716a1bdf626afbc81fe0 Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Fri, 10 Nov 2023 16:13:04 -0500 Subject: [PATCH] Publish FFI with children Signed-off-by: Nicko Guyer --- internal/definitions/sender_contracts.go | 2 +- internal/definitions/sender_contracts_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/definitions/sender_contracts.go b/internal/definitions/sender_contracts.go index 30f162febd..7264a9f926 100644 --- a/internal/definitions/sender_contracts.go +++ b/internal/definitions/sender_contracts.go @@ -99,7 +99,7 @@ func (ds *definitionSender) PublishFFI(ctx context.Context, name, version, netwo var sender *sendWrapper err = ds.database.RunAsGroup(ctx, func(ctx context.Context) error { - if ffi, err = ds.contracts.GetFFI(ctx, name, version); err != nil { + if ffi, err = ds.contracts.GetFFIWithChildren(ctx, name, version); err != nil { return err } if ffi.Published { diff --git a/internal/definitions/sender_contracts_test.go b/internal/definitions/sender_contracts_test.go index f9ab92fdfb..b0717cc460 100644 --- a/internal/definitions/sender_contracts_test.go +++ b/internal/definitions/sender_contracts_test.go @@ -359,7 +359,7 @@ func TestPublishFFI(t *testing.T) { } ds.mdi.On("GetFFIByNetworkName", context.Background(), "ns1", "ffi1-shared", "1.0").Return(nil, nil) - ds.mcm.On("GetFFI", context.Background(), "ffi1", "1.0").Return(ffi, nil) + ds.mcm.On("GetFFIWithChildren", context.Background(), "ffi1", "1.0").Return(ffi, nil) ds.mcm.On("ResolveFFI", context.Background(), ffi).Return(nil) ds.mim.On("GetRootOrg", context.Background()).Return(&core.Identity{ IdentityBase: core.IdentityBase{ @@ -392,7 +392,7 @@ func TestPublishFFIAlreadyPublished(t *testing.T) { Published: true, } - ds.mcm.On("GetFFI", context.Background(), "ffi1", "1.0").Return(ffi, nil) + ds.mcm.On("GetFFIWithChildren", context.Background(), "ffi1", "1.0").Return(ffi, nil) mockRunAsGroupPassthrough(ds.mdi) _, err := ds.PublishFFI(context.Background(), "ffi1", "1.0", "ffi1-shared", false) @@ -404,7 +404,7 @@ func TestPublishFFIQueryFail(t *testing.T) { defer ds.cleanup(t) ds.multiparty = true - ds.mcm.On("GetFFI", context.Background(), "ffi1", "1.0").Return(nil, fmt.Errorf("pop")) + ds.mcm.On("GetFFIWithChildren", context.Background(), "ffi1", "1.0").Return(nil, fmt.Errorf("pop")) mockRunAsGroupPassthrough(ds.mdi) _, err := ds.PublishFFI(context.Background(), "ffi1", "1.0", "ffi1-shared", false) @@ -423,7 +423,7 @@ func TestPublishFFIResolveFail(t *testing.T) { Published: false, } - ds.mcm.On("GetFFI", context.Background(), "ffi1", "1.0").Return(ffi, nil) + ds.mcm.On("GetFFIWithChildren", context.Background(), "ffi1", "1.0").Return(ffi, nil) ds.mcm.On("ResolveFFI", context.Background(), ffi).Return(fmt.Errorf("pop")) mockRunAsGroupPassthrough(ds.mdi) @@ -446,7 +446,7 @@ func TestPublishFFIPrepareFail(t *testing.T) { } ds.mdi.On("GetFFIByNetworkName", context.Background(), "ns1", "ffi1-shared", "1.0").Return(nil, nil) - ds.mcm.On("GetFFI", context.Background(), "ffi1", "1.0").Return(ffi, nil) + ds.mcm.On("GetFFIWithChildren", context.Background(), "ffi1", "1.0").Return(ffi, nil) ds.mcm.On("ResolveFFI", context.Background(), ffi).Return(nil) ds.mim.On("GetRootOrg", context.Background()).Return(&core.Identity{ IdentityBase: core.IdentityBase{