Skip to content

Commit ad83413

Browse files
committed
feat: use GetActiveBlockchainProvider() in /get-form-data API
1 parent 6d1fedd commit ad83413

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

controllers/form_data.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (c *ApiController) GetFormData() {
5454
return
5555
}
5656

57-
blockchainProvider, err := object.GetDefaultBlockchainProvider()
57+
blockchainProvider, err := object.GetActiveBlockchainProvider("admin")
5858
if blockchainProvider == nil {
5959
c.ResponseError("The default blockchain provider is not found")
6060
return

object/provider_util.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,18 @@ func getActiveCloudProviders(owner string) ([]*Provider, error) {
154154
return res, nil
155155
}
156156

157-
func getActiveBlockchainProvider(owner string) (*Provider, error) {
157+
func GetActiveBlockchainProvider(owner string) (*Provider, error) {
158158
providers, err := GetProviders(owner)
159159
if err != nil {
160160
return nil, err
161161
}
162162

163+
for _, provider := range providers {
164+
if provider.Category == "Blockchain" && provider.IsDefault {
165+
return provider, nil
166+
}
167+
}
168+
163169
for _, provider := range providers {
164170
if ((provider.ClientId != "" && provider.ClientSecret != "") || provider.Type == "ChainMaker") && provider.Category == "Blockchain" && provider.State == "Active" {
165171
return provider, nil

object/record.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func AddRecord(record *Record) (bool, error) {
184184
}
185185

186186
if record.Provider == "" {
187-
provider, err := getActiveBlockchainProvider("admin")
187+
provider, err := GetActiveBlockchainProvider("admin")
188188
if err != nil {
189189
return false, err
190190
}

object/record_chain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (record *Record) getRecordProvider() (*Provider, error) {
3939
}
4040
}
4141

42-
provider, err := getActiveBlockchainProvider("admin")
42+
provider, err := GetActiveBlockchainProvider("admin")
4343
if err != nil {
4444
return nil, err
4545
}

0 commit comments

Comments
 (0)