Merge pull request #878 from kaleido-io/definitions2

Enable non-multiparty namespaces

Makefile

@@ -62,7 +62,8 @@ $(eval $(call makemock, internal/broadcast,        Manager,            broadcast
 $(eval $(call makemock, internal/privatemessaging, Manager,            privatemessagingmocks))
 $(eval $(call makemock, internal/shareddownload,   Manager,            shareddownloadmocks))
 $(eval $(call makemock, internal/shareddownload,   Callbacks,          shareddownloadmocks))
-$(eval $(call makemock, internal/definitions,      DefinitionHandler,  definitionsmocks))
+$(eval $(call makemock, internal/definitions,      Handler,            definitionsmocks))
+$(eval $(call makemock, internal/definitions,      Sender,             definitionsmocks))
 $(eval $(call makemock, internal/events,           EventManager,       eventmocks))
 $(eval $(call makemock, internal/namespace,        Manager,            namespacemocks))
 $(eval $(call makemock, internal/networkmap,       Manager,            networkmapmocks))

db/migrations/postgres/000094_allow_local_definitions.down.sql

@@ -0,0 +1 @@
+-- No down migration (can't add back NOT NULL constraint)

db/migrations/postgres/000094_allow_local_definitions.up.sql

@@ -0,0 +1,16 @@
+BEGIN;
+ALTER TABLE identities RENAME COLUMN messages_claim TO messages_claim_old;
+ALTER TABLE identities ADD COLUMN messages_claim UUID;
+UPDATE identities SET messages_claim = messages_claim_old;
+ALTER TABLE identities DROP COLUMN messages_claim_old;
+
+ALTER TABLE ffi RENAME COLUMN message_id TO message_id_old;
+ALTER TABLE ffi ADD COLUMN message_id UUID;
+UPDATE ffi SET message_id = message_id_old;
+ALTER TABLE ffi DROP COLUMN message_id_old;
+
+ALTER TABLE contractapis RENAME COLUMN message_id TO message_id_old;
+ALTER TABLE contractapis ADD COLUMN message_id UUID;
+UPDATE contractapis SET message_id = message_id_old;
+ALTER TABLE contractapis DROP COLUMN message_id_old;
+COMMIT;

db/migrations/sqlite/000094_allow_local_definitions.down.sql

@@ -0,0 +1 @@
+-- No down migration (can't add back NOT NULL constraint)

db/migrations/sqlite/000094_allow_local_definitions.up.sql

@@ -0,0 +1,14 @@
+ALTER TABLE identities RENAME COLUMN messages_claim TO messages_claim_old;
+ALTER TABLE identities ADD COLUMN messages_claim UUID;
+UPDATE identities SET messages_claim = messages_claim_old;
+ALTER TABLE identities DROP COLUMN messages_claim_old;
+
+ALTER TABLE ffi RENAME COLUMN message_id TO message_id_old;
+ALTER TABLE ffi ADD COLUMN message_id UUID;
+UPDATE ffi SET message_id = message_id_old;
+ALTER TABLE ffi DROP COLUMN message_id_old;
+
+ALTER TABLE contractapis RENAME COLUMN message_id TO message_id_old;
+ALTER TABLE contractapis ADD COLUMN message_id UUID;
+UPDATE contractapis SET message_id = message_id_old;
+ALTER TABLE contractapis DROP COLUMN message_id_old;

docs/reference/config.md

@@ -336,7 +336,7 @@ nav_order: 2
 
 |Key|Description|Type|Default Value|
 |---|-----------|----|-------------|
-|type|The Data Exchange plugin to use|`string`|`ffdx`
+|type|The Data Exchange plugin to use|`string`|`<nil>`
 
 ## dataexchange.ffdx
 
@@ -585,11 +585,11 @@ nav_order: 2
 
 |Key|Description|Type|Default Value|
 |---|-----------|----|-------------|
-|defaultKey|A default signing key for blockchain transactions within this namespace|`string`|`<nil>`
+|defaultkey|A default signing key for blockchain transactions within this namespace|`string`|`<nil>`
 |description|A description for the namespace|`string`|`<nil>`
 |name|The name of the namespace (must be unique)|`string`|`<nil>`
 |plugins|The list of plugins for this namespace|`string`|`<nil>`
-|remoteName|The namespace name to be sent in plugin calls, if it differs from namespace name|`string`|`<nil>`
+|remotename|The namespace name to be sent in plugin calls, if it differs from namespace name|`string`|`<nil>`
 
 ## namespaces.predefined[].multiparty
 

internal/apiserver/route_get_data_blob.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/hyperledger/firefly-common/pkg/ffapi"
 	"github.com/hyperledger/firefly/internal/coremsgs"
+	"github.com/hyperledger/firefly/internal/orchestrator"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/hyperledger/firefly/pkg/database"
 )
@@ -40,6 +41,9 @@ var getDataBlob = &ffapi.Route{
 	JSONOutputCodes: []int{http.StatusOK},
 	Extensions: &coreExtensions{
 		FilterFactory: database.MessageQueryFactory,
+		EnabledIf: func(or orchestrator.Orchestrator) bool {
+			return or.MultiParty() != nil
+		},
 		CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
 			blob, reader, err := cr.or.Data().DownloadBlob(cr.ctx, r.PP["dataid"])
 			if err == nil {

internal/apiserver/route_get_data_blob_test.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly/mocks/datamocks"
+	"github.com/hyperledger/firefly/mocks/multipartymocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -33,6 +34,7 @@ func TestGetDataBlob(t *testing.T) {
 	o, r := newTestAPIServer()
 	mdm := &datamocks.Manager{}
 	o.On("Data").Return(mdm)
+	o.On("MultiParty").Return(&multipartymocks.Manager{})
 	req := httptest.NewRequest("GET", "/api/v1/namespaces/mynamespace/data/abcd1234/blob", nil)
 	req.Header.Set("Content-Type", "application/json; charset=utf-8")
 	res := httptest.NewRecorder()

internal/apiserver/route_get_group_by_id.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/hyperledger/firefly-common/pkg/ffapi"
 	"github.com/hyperledger/firefly/internal/coremsgs"
+	"github.com/hyperledger/firefly/internal/orchestrator"
 	"github.com/hyperledger/firefly/pkg/core"
 )
 
@@ -37,9 +38,11 @@ var getGroupByHash = &ffapi.Route{
 	JSONOutputValue: func() interface{} { return &core.Group{} },
 	JSONOutputCodes: []int{http.StatusOK},
 	Extensions: &coreExtensions{
+		EnabledIf: func(or orchestrator.Orchestrator) bool {
+			return or.PrivateMessaging() != nil
+		},
 		CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
-			output, err = cr.or.PrivateMessaging().GetGroupByID(cr.ctx, r.PP["hash"])
-			return output, err
+			return cr.or.PrivateMessaging().GetGroupByID(cr.ctx, r.PP["hash"])
 		},
 	},
 }

internal/apiserver/route_get_groups.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/hyperledger/firefly-common/pkg/ffapi"
 	"github.com/hyperledger/firefly/internal/coremsgs"
+	"github.com/hyperledger/firefly/internal/orchestrator"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/hyperledger/firefly/pkg/database"
 )
@@ -37,6 +38,9 @@ var getGroups = &ffapi.Route{
 	JSONOutputCodes: []int{http.StatusOK},
 	Extensions: &coreExtensions{
 		FilterFactory: database.GroupQueryFactory,
+		EnabledIf: func(or orchestrator.Orchestrator) bool {
+			return or.PrivateMessaging() != nil
+		},
 		CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
 			return filterResult(cr.or.PrivateMessaging().GetGroups(cr.ctx, cr.filter))
 		},

internal/apiserver/route_get_status_batchmanager.go

@@ -22,6 +22,7 @@ import (
 	"github.com/hyperledger/firefly-common/pkg/ffapi"
 	"github.com/hyperledger/firefly/internal/batch"
 	"github.com/hyperledger/firefly/internal/coremsgs"
+	"github.com/hyperledger/firefly/internal/orchestrator"
 )
 
 var getStatusBatchManager = &ffapi.Route{
@@ -35,9 +36,11 @@ var getStatusBatchManager = &ffapi.Route{
 	JSONOutputValue: func() interface{} { return &batch.ManagerStatus{} },
 	JSONOutputCodes: []int{http.StatusOK},
 	Extensions: &coreExtensions{
+		EnabledIf: func(or orchestrator.Orchestrator) bool {
+			return or.BatchManager() != nil
+		},
 		CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
-			output = cr.or.BatchManager().Status()
-			return output, nil
+			return cr.or.BatchManager().Status(), nil
 		},
 	},
 }

internal/apiserver/route_post_data.go

@@ -25,6 +25,7 @@ import (
 	"github.com/hyperledger/firefly-common/pkg/ffapi"
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly/internal/coremsgs"
+	"github.com/hyperledger/firefly/internal/orchestrator"
 	"github.com/hyperledger/firefly/pkg/core"
 )
 
@@ -46,6 +47,9 @@ var postData = &ffapi.Route{
 	JSONOutputValue: func() interface{} { return &core.Data{} },
 	JSONOutputCodes: []int{http.StatusCreated},
 	Extensions: &coreExtensions{
+		EnabledIf: func(or orchestrator.Orchestrator) bool {
+			return or.MultiParty() != nil
+		},
 		CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
 			output, err = cr.or.Data().UploadJSON(cr.ctx, r.Input.(*core.DataRefOrValue))
 			return output, err

internal/apiserver/route_post_data_test.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/hyperledger/firefly-common/pkg/log"
 	"github.com/hyperledger/firefly/mocks/datamocks"
+	"github.com/hyperledger/firefly/mocks/multipartymocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -34,6 +35,7 @@ import (
 func TestPostDataJSON(t *testing.T) {
 	o, r := newTestAPIServer()
 	mdm := &datamocks.Manager{}
+	o.On("MultiParty").Return(&multipartymocks.Manager{})
 	o.On("Data").Return(mdm)
 	input := core.Data{}
 	var buf bytes.Buffer
@@ -52,6 +54,7 @@ func TestPostDataJSON(t *testing.T) {
 func TestPostDataJSONDefaultNS(t *testing.T) {
 	o, r := newTestAPIServer()
 	mdm := &datamocks.Manager{}
+	o.On("MultiParty").Return(&multipartymocks.Manager{})
 	o.On("Data").Return(mdm)
 	input := core.Data{}
 	var buf bytes.Buffer
@@ -72,6 +75,7 @@ func TestPostDataBinary(t *testing.T) {
 
 	o, r := newTestAPIServer()
 	mdm := &datamocks.Manager{}
+	o.On("MultiParty").Return(&multipartymocks.Manager{})
 	o.On("Data").Return(mdm)
 
 	var b bytes.Buffer
@@ -97,6 +101,7 @@ func TestPostDataBinaryObjAutoMeta(t *testing.T) {
 
 	o, r := newTestAPIServer()
 	mdm := &datamocks.Manager{}
+	o.On("MultiParty").Return(&multipartymocks.Manager{})
 	o.On("Data").Return(mdm)
 
 	var b bytes.Buffer
@@ -143,6 +148,7 @@ func TestPostDataBinaryStringMetadata(t *testing.T) {
 
 	o, r := newTestAPIServer()
 	mdm := &datamocks.Manager{}
+	o.On("MultiParty").Return(&multipartymocks.Manager{})
 	o.On("Data").Return(mdm)
 
 	var b bytes.Buffer
@@ -176,6 +182,7 @@ func TestPostDataTrailingMetadata(t *testing.T) {
 
 	o, r := newTestAPIServer()
 	mdm := &datamocks.Manager{}
+	o.On("MultiParty").Return(&multipartymocks.Manager{})
 	o.On("Data").Return(mdm)
 
 	var b bytes.Buffer
@@ -207,6 +214,7 @@ func TestPostDataBinaryMissing(t *testing.T) {
 
 	o, r := newTestAPIServer()
 	mdm := &datamocks.Manager{}
+	o.On("MultiParty").Return(&multipartymocks.Manager{})
 	o.On("Data").Return(mdm)
 
 	var b bytes.Buffer
@@ -231,6 +239,7 @@ func TestPostDataBadForm(t *testing.T) {
 
 	o, r := newTestAPIServer()
 	mdm := &datamocks.Manager{}
+	o.On("MultiParty").Return(&multipartymocks.Manager{})
 	o.On("Data").Return(mdm)
 
 	var b bytes.Buffer

internal/apiserver/route_post_network_action.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/hyperledger/firefly-common/pkg/ffapi"
 	"github.com/hyperledger/firefly/internal/coremsgs"
+	"github.com/hyperledger/firefly/internal/orchestrator"
 	"github.com/hyperledger/firefly/pkg/core"
 )
 
@@ -35,6 +36,9 @@ var postNetworkAction = &ffapi.Route{
 	JSONOutputValue: func() interface{} { return &core.NetworkAction{} },
 	JSONOutputCodes: []int{http.StatusAccepted},
 	Extensions: &coreExtensions{
+		EnabledIf: func(or orchestrator.Orchestrator) bool {
+			return or.MultiParty() != nil
+		},
 		CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
 			err = cr.or.SubmitNetworkAction(cr.ctx, r.Input.(*core.NetworkAction))
 			return r.Input, err

internal/apiserver/route_post_network_action_test.go

@@ -22,13 +22,15 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/hyperledger/firefly/mocks/multipartymocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
 
 func TestPostNetworkAction(t *testing.T) {
 	o, r := newTestAPIServer()
+	o.On("MultiParty").Return(&multipartymocks.Manager{})
 	input := core.NetworkAction{}
 	var buf bytes.Buffer
 	json.NewEncoder(&buf).Encode(&input)

internal/apiserver/route_post_new_contract_api.go

@@ -41,7 +41,9 @@ var postNewContractAPI = &ffapi.Route{
 		CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
 			waitConfirm := strings.EqualFold(r.QP["confirm"], "true")
 			r.SuccessStatus = syncRetcode(waitConfirm)
-			return cr.or.Contracts().BroadcastContractAPI(cr.ctx, cr.apiBaseURL, r.Input.(*core.ContractAPI), waitConfirm)
+			api := r.Input.(*core.ContractAPI)
+			err = cr.or.DefinitionSender().DefineContractAPI(cr.ctx, cr.apiBaseURL, api, waitConfirm)
+			return api, err
 		},
 	},
 }

internal/apiserver/route_post_new_contract_api_test.go

@@ -22,43 +22,41 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/hyperledger/firefly/mocks/contractmocks"
+	"github.com/hyperledger/firefly/mocks/definitionsmocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
 
 func TestPostNewContractAPI(t *testing.T) {
 	o, r := newTestAPIServer()
-	mcm := &contractmocks.Manager{}
-	o.On("Contracts").Return(mcm)
+	mds := &definitionsmocks.Sender{}
+	o.On("DefinitionSender").Return(mds)
 	input := core.Datatype{}
 	var buf bytes.Buffer
 	json.NewEncoder(&buf).Encode(&input)
 	req := httptest.NewRequest("POST", "/api/v1/namespaces/ns1/apis", &buf)
 	req.Header.Set("Content-Type", "application/json; charset=utf-8")
 	res := httptest.NewRecorder()
 
-	mcm.On("BroadcastContractAPI", mock.Anything, mock.Anything, mock.AnythingOfType("*core.ContractAPI"), false).
-		Return(&core.ContractAPI{}, nil)
+	mds.On("DefineContractAPI", mock.Anything, mock.Anything, mock.AnythingOfType("*core.ContractAPI"), false).Return(nil)
 	r.ServeHTTP(res, req)
 
 	assert.Equal(t, 202, res.Result().StatusCode)
 }
 
 func TestPostNewContractAPISync(t *testing.T) {
 	o, r := newTestAPIServer()
-	mcm := &contractmocks.Manager{}
-	o.On("Contracts").Return(mcm)
+	mds := &definitionsmocks.Sender{}
+	o.On("DefinitionSender").Return(mds)
 	input := core.Datatype{}
 	var buf bytes.Buffer
 	json.NewEncoder(&buf).Encode(&input)
 	req := httptest.NewRequest("POST", "/api/v1/namespaces/ns1/apis?confirm", &buf)
 	req.Header.Set("Content-Type", "application/json; charset=utf-8")
 	res := httptest.NewRecorder()
 
-	mcm.On("BroadcastContractAPI", mock.Anything, mock.Anything, mock.AnythingOfType("*core.ContractAPI"), true).
-		Return(&core.ContractAPI{}, nil)
+	mds.On("DefineContractAPI", mock.Anything, mock.Anything, mock.AnythingOfType("*core.ContractAPI"), true).Return(nil)
 	r.ServeHTTP(res, req)
 
 	assert.Equal(t, 200, res.Result().StatusCode)

internal/apiserver/route_post_new_contract_interface.go

@@ -41,7 +41,9 @@ var postNewContractInterface = &ffapi.Route{
 		CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
 			waitConfirm := strings.EqualFold(r.QP["confirm"], "true")
 			r.SuccessStatus = syncRetcode(waitConfirm)
-			return cr.or.Contracts().BroadcastFFI(cr.ctx, r.Input.(*core.FFI), waitConfirm)
+			ffi := r.Input.(*core.FFI)
+			err = cr.or.DefinitionSender().DefineFFI(cr.ctx, ffi, waitConfirm)
+			return ffi, err
 		},
 	},
 }