diff --git a/internal/blockchain/ethereum/ethereum.go b/internal/blockchain/ethereum/ethereum.go index c2e4a7b79..7cca630fd 100644 --- a/internal/blockchain/ethereum/ethereum.go +++ b/internal/blockchain/ethereum/ethereum.go @@ -607,7 +607,7 @@ func (e *Ethereum) applyOptions(ctx context.Context, body, options map[string]in return body, nil } -func (e *Ethereum) invokeContractMethod(ctx context.Context, address, signingKey string, abi *abi.Entry, requestID string, input []interface{}, errors []*abi.Entry, options map[string]interface{}) (bool, error) { +func (e *Ethereum) invokeContractMethod(ctx context.Context, address, signingKey string, abi *abi.Entry, requestID string, input []interface{}, errors []*abi.Entry, options map[string]interface{}) (submissionRejected bool, err error) { if e.metrics.IsMetricsEnabled() { e.metrics.BlockchainTransaction(address, abi.Name) } @@ -736,7 +736,7 @@ func (e *Ethereum) SubmitNetworkAction(ctx context.Context, nsOpID string, signi return err } -func (e *Ethereum) DeployContract(ctx context.Context, nsOpID, signingKey string, definition, contract *fftypes.JSONAny, input []interface{}, options map[string]interface{}) (bool, error) { +func (e *Ethereum) DeployContract(ctx context.Context, nsOpID, signingKey string, definition, contract *fftypes.JSONAny, input []interface{}, options map[string]interface{}) (submissionRejected bool, err error) { if e.metrics.IsMetricsEnabled() { e.metrics.BlockchainContractDeployment() } @@ -754,7 +754,7 @@ func (e *Ethereum) DeployContract(ctx context.Context, nsOpID, signingKey string if signingKey != "" { body["from"] = signingKey } - body, err := e.applyOptions(ctx, body, options) + body, err = e.applyOptions(ctx, body, options) if err != nil { return true, err } diff --git a/internal/blockchain/fabric/fabric.go b/internal/blockchain/fabric/fabric.go index d9dee31b2..03b3fca8e 100644 --- a/internal/blockchain/fabric/fabric.go +++ b/internal/blockchain/fabric/fabric.go @@ -598,7 +598,7 @@ func (f *Fabric) ResolveSigningKey(ctx context.Context, signingKeyInput string, return signingKeyInput, nil } -func (f *Fabric) invokeContractMethod(ctx context.Context, channel, chaincode, methodName, signingKey, requestID string, prefixItems []*PrefixItem, input map[string]interface{}, options map[string]interface{}) (bool, error) { +func (f *Fabric) invokeContractMethod(ctx context.Context, channel, chaincode, methodName, signingKey, requestID string, prefixItems []*PrefixItem, input map[string]interface{}, options map[string]interface{}) (submissionRejected bool, err error) { body, err := f.buildFabconnectRequestBody(ctx, channel, chaincode, methodName, signingKey, requestID, prefixItems, input, options) if err != nil { return true, err @@ -770,7 +770,7 @@ func (f *Fabric) buildFabconnectRequestBody(ctx context.Context, channel, chainc return body, nil } -func (f *Fabric) DeployContract(ctx context.Context, nsOpID, signingKey string, definition, contract *fftypes.JSONAny, input []interface{}, options map[string]interface{}) (bool, error) { +func (f *Fabric) DeployContract(ctx context.Context, nsOpID, signingKey string, definition, contract *fftypes.JSONAny, input []interface{}, options map[string]interface{}) (submissionRejected bool, err error) { return true, i18n.NewError(ctx, coremsgs.MsgNotSupportedByBlockchainPlugin) } diff --git a/internal/blockchain/tezos/tezos.go b/internal/blockchain/tezos/tezos.go index e791b5c54..f5dd984d4 100644 --- a/internal/blockchain/tezos/tezos.go +++ b/internal/blockchain/tezos/tezos.go @@ -300,7 +300,7 @@ func (t *Tezos) SubmitNetworkAction(ctx context.Context, nsOpID string, signingK return nil } -func (t *Tezos) DeployContract(ctx context.Context, nsOpID, signingKey string, definition, contract *fftypes.JSONAny, input []interface{}, options map[string]interface{}) (bool, error) { +func (t *Tezos) DeployContract(ctx context.Context, nsOpID, signingKey string, definition, contract *fftypes.JSONAny, input []interface{}, options map[string]interface{}) (submissionRejected bool, err error) { return true, i18n.NewError(ctx, coremsgs.MsgNotSupportedByBlockchainPlugin) } @@ -516,7 +516,7 @@ func (t *Tezos) recoverFFI(ctx context.Context, parsedMethod interface{}) (*ffty return methodInfo.method, methodInfo.errors, nil } -func (t *Tezos) invokeContractMethod(ctx context.Context, address, methodName, signingKey, requestID string, michelsonInput micheline.Parameters, options map[string]interface{}) (bool, error) { +func (t *Tezos) invokeContractMethod(ctx context.Context, address, methodName, signingKey, requestID string, michelsonInput micheline.Parameters, options map[string]interface{}) (submissionRejected bool, err error) { if t.metrics.IsMetricsEnabled() { t.metrics.BlockchainTransaction(address, methodName) }