Skip to content

Commit 0fc6b12

Browse files
ashcherbakovashcherbakov
authored
Merge pull request #335 from abdulla-ashurov/abdulla/issue-312
Abdulla/issue 312
2 parents da80b19 + 268e7bb commit 0fc6b12

File tree

54 files changed

+592
-592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+592
-592
lines changed

‎docs/static/openapi.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -10160,7 +10160,7 @@ paths:
1016010160
type: string
1016110161
companyLegalName:
1016210162
type: string
10163-
companyPrefferedName:
10163+
companyPreferredName:
1016410164
type: string
1016510165
vendorLandingPageURL:
1016610166
type: string
@@ -10294,7 +10294,7 @@ paths:
1029410294
type: string
1029510295
companyLegalName:
1029610296
type: string
10297-
companyPrefferedName:
10297+
companyPreferredName:
1029810298
type: string
1029910299
vendorLandingPageURL:
1030010300
type: string
@@ -16586,7 +16586,7 @@ definitions:
1658616586
type: string
1658716587
companyLegalName:
1658816588
type: string
16589-
companyPrefferedName:
16589+
companyPreferredName:
1659016590
type: string
1659116591
vendorLandingPageURL:
1659216592
type: string
@@ -16630,7 +16630,7 @@ definitions:
1663016630
type: string
1663116631
companyLegalName:
1663216632
type: string
16633-
companyPrefferedName:
16633+
companyPreferredName:
1663416634
type: string
1663516635
vendorLandingPageURL:
1663616636
type: string
@@ -16646,7 +16646,7 @@ definitions:
1664616646
type: string
1664716647
companyLegalName:
1664816648
type: string
16649-
companyPrefferedName:
16649+
companyPreferredName:
1665016650
type: string
1665116651
vendorLandingPageURL:
1665216652
type: string

‎integration_tests/grpc_rest/vendorinfo/helpers.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func NewMsgCreateVendorInfo(vid int32, signer string) *vendorinfotypes.MsgCreate
2121
VendorID: vid,
2222
VendorName: testconstants.VendorName,
2323
CompanyLegalName: testconstants.CompanyLegalName,
24-
CompanyPrefferedName: testconstants.CompanyPreferredName,
24+
CompanyPreferredName: testconstants.CompanyPreferredName,
2525
VendorLandingPageURL: testconstants.VendorLandingPageURL,
2626
}
2727
}
@@ -32,7 +32,7 @@ func NewMsgUpdateVendorInfo(vid int32, signer string) *vendorinfotypes.MsgUpdate
3232
VendorID: vid,
3333
VendorName: testconstants.VendorName + "/new",
3434
CompanyLegalName: testconstants.CompanyLegalName + "/new",
35-
CompanyPrefferedName: testconstants.CompanyPreferredName + "/new",
35+
CompanyPreferredName: testconstants.CompanyPreferredName + "/new",
3636
VendorLandingPageURL: testconstants.VendorLandingPageURL + "/new",
3737
}
3838
}

‎proto/vendorinfo/tx.proto

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ message MsgCreateVendorInfo {
2121

2222
string vendorName = 3 [(gogoproto.moretags) = "validate:\"required,max=128\""];
2323
string companyLegalName = 4 [(gogoproto.moretags) = "validate:\"required,max=256\""];
24-
string companyPrefferedName = 5 [(gogoproto.moretags) = "validate:\"omitempty,max=256\""];
24+
string companyPreferredName = 5 [(gogoproto.moretags) = "validate:\"omitempty,max=256\""];
2525
string vendorLandingPageURL = 6 [(gogoproto.moretags) = "validate:\"omitempty,max=256,url\""];
2626
}
2727
message MsgCreateVendorInfoResponse {}
@@ -32,7 +32,7 @@ message MsgUpdateVendorInfo {
3232

3333
string vendorName = 3 [(gogoproto.moretags) = "validate:\"required,max=128\""];
3434
string companyLegalName = 4 [(gogoproto.moretags) = "validate:\"required,max=256\""];
35-
string companyPrefferedName = 5 [(gogoproto.moretags) = "validate:\"omitempty,max=256\""];
35+
string companyPreferredName = 5 [(gogoproto.moretags) = "validate:\"omitempty,max=256\""];
3636
string vendorLandingPageURL = 6 [(gogoproto.moretags) = "validate:\"omitempty,max=256,url\""];
3737
}
3838
message MsgUpdateVendorInfoResponse {}

‎proto/vendorinfo/vendor_info.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ message VendorInfo {
99
int32 vendorID = 1;
1010
string vendorName = 2;
1111
string companyLegalName = 3;
12-
string companyPrefferedName = 4;
12+
string companyPreferredName = 4;
1313
string vendorLandingPageURL = 5;
1414
string creator = 6 [(cosmos_proto.scalar) = "cosmos.AddressString"];
1515
}

‎scripts/starport/upgrade-0.44/06.vendorinfo_types.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#VendorInfo
2-
starport scaffold --module vendorinfo map VendorInfo vendorName:string companyLegalName:string companyPrefferedName:string vendorLandingPageURL:string --index vendorID:int
2+
starport scaffold --module vendorinfo map VendorInfo vendorName:string companyLegalName:string companyPreferredName:string vendorLandingPageURL:string --index vendorID:int

‎vue/src/store/generated/zigbee-alliance/distributed-compliance-ledger/zigbeealliance.distributedcomplianceledger.compliance/index.js

+16-16
Original file line numberDiff line numberDiff line change
@@ -288,37 +288,37 @@ export default {
288288
throw new SpVuexError('QueryClient:QueryProvisionalModelAll', 'API Node Unavailable. Could not perform query: ' + e.message);
289289
}
290290
},
291-
async sendMsgCertifyModel({ rootGetters }, { value, fee = [], memo = '' }) {
291+
async sendMsgProvisionModel({ rootGetters }, { value, fee = [], memo = '' }) {
292292
try {
293293
const txClient = await initTxClient(rootGetters);
294-
const msg = await txClient.msgCertifyModel(value);
294+
const msg = await txClient.msgProvisionModel(value);
295295
const result = await txClient.signAndBroadcast([msg], { fee: { amount: fee,
296296
gas: "200000" }, memo });
297297
return result;
298298
}
299299
catch (e) {
300300
if (e == MissingWalletError) {
301-
throw new SpVuexError('TxClient:MsgCertifyModel:Init', 'Could not initialize signing client. Wallet is required.');
301+
throw new SpVuexError('TxClient:MsgProvisionModel:Init', 'Could not initialize signing client. Wallet is required.');
302302
}
303303
else {
304-
throw new SpVuexError('TxClient:MsgCertifyModel:Send', 'Could not broadcast Tx: ' + e.message);
304+
throw new SpVuexError('TxClient:MsgProvisionModel:Send', 'Could not broadcast Tx: ' + e.message);
305305
}
306306
}
307307
},
308-
async sendMsgProvisionModel({ rootGetters }, { value, fee = [], memo = '' }) {
308+
async sendMsgCertifyModel({ rootGetters }, { value, fee = [], memo = '' }) {
309309
try {
310310
const txClient = await initTxClient(rootGetters);
311-
const msg = await txClient.msgProvisionModel(value);
311+
const msg = await txClient.msgCertifyModel(value);
312312
const result = await txClient.signAndBroadcast([msg], { fee: { amount: fee,
313313
gas: "200000" }, memo });
314314
return result;
315315
}
316316
catch (e) {
317317
if (e == MissingWalletError) {
318-
throw new SpVuexError('TxClient:MsgProvisionModel:Init', 'Could not initialize signing client. Wallet is required.');
318+
throw new SpVuexError('TxClient:MsgCertifyModel:Init', 'Could not initialize signing client. Wallet is required.');
319319
}
320320
else {
321-
throw new SpVuexError('TxClient:MsgProvisionModel:Send', 'Could not broadcast Tx: ' + e.message);
321+
throw new SpVuexError('TxClient:MsgCertifyModel:Send', 'Could not broadcast Tx: ' + e.message);
322322
}
323323
}
324324
},
@@ -339,33 +339,33 @@ export default {
339339
}
340340
}
341341
},
342-
async MsgCertifyModel({ rootGetters }, { value }) {
342+
async MsgProvisionModel({ rootGetters }, { value }) {
343343
try {
344344
const txClient = await initTxClient(rootGetters);
345-
const msg = await txClient.msgCertifyModel(value);
345+
const msg = await txClient.msgProvisionModel(value);
346346
return msg;
347347
}
348348
catch (e) {
349349
if (e == MissingWalletError) {
350-
throw new SpVuexError('TxClient:MsgCertifyModel:Init', 'Could not initialize signing client. Wallet is required.');
350+
throw new SpVuexError('TxClient:MsgProvisionModel:Init', 'Could not initialize signing client. Wallet is required.');
351351
}
352352
else {
353-
throw new SpVuexError('TxClient:MsgCertifyModel:Create', 'Could not create message: ' + e.message);
353+
throw new SpVuexError('TxClient:MsgProvisionModel:Create', 'Could not create message: ' + e.message);
354354
}
355355
}
356356
},
357-
async MsgProvisionModel({ rootGetters }, { value }) {
357+
async MsgCertifyModel({ rootGetters }, { value }) {
358358
try {
359359
const txClient = await initTxClient(rootGetters);
360-
const msg = await txClient.msgProvisionModel(value);
360+
const msg = await txClient.msgCertifyModel(value);
361361
return msg;
362362
}
363363
catch (e) {
364364
if (e == MissingWalletError) {
365-
throw new SpVuexError('TxClient:MsgProvisionModel:Init', 'Could not initialize signing client. Wallet is required.');
365+
throw new SpVuexError('TxClient:MsgCertifyModel:Init', 'Could not initialize signing client. Wallet is required.');
366366
}
367367
else {
368-
throw new SpVuexError('TxClient:MsgProvisionModel:Create', 'Could not create message: ' + e.message);
368+
throw new SpVuexError('TxClient:MsgCertifyModel:Create', 'Could not create message: ' + e.message);
369369
}
370370
}
371371
},

‎vue/src/store/generated/zigbee-alliance/distributed-compliance-ledger/zigbeealliance.distributedcomplianceledger.compliance/index.ts

+16-16
Original file line numberDiff line numberDiff line change
@@ -364,33 +364,33 @@ export default {
364364
},
365365

366366

367-
async sendMsgCertifyModel({ rootGetters }, { value, fee = [], memo = '' }) {
367+
async sendMsgProvisionModel({ rootGetters }, { value, fee = [], memo = '' }) {
368368
try {
369369
const txClient=await initTxClient(rootGetters)
370-
const msg = await txClient.msgCertifyModel(value)
370+
const msg = await txClient.msgProvisionModel(value)
371371
const result = await txClient.signAndBroadcast([msg], {fee: { amount: fee,
372372
gas: "200000" }, memo})
373373
return result
374374
} catch (e) {
375375
if (e == MissingWalletError) {
376-
throw new SpVuexError('TxClient:MsgCertifyModel:Init', 'Could not initialize signing client. Wallet is required.')
376+
throw new SpVuexError('TxClient:MsgProvisionModel:Init', 'Could not initialize signing client. Wallet is required.')
377377
}else{
378-
throw new SpVuexError('TxClient:MsgCertifyModel:Send', 'Could not broadcast Tx: '+ e.message)
378+
throw new SpVuexError('TxClient:MsgProvisionModel:Send', 'Could not broadcast Tx: '+ e.message)
379379
}
380380
}
381381
},
382-
async sendMsgProvisionModel({ rootGetters }, { value, fee = [], memo = '' }) {
382+
async sendMsgCertifyModel({ rootGetters }, { value, fee = [], memo = '' }) {
383383
try {
384384
const txClient=await initTxClient(rootGetters)
385-
const msg = await txClient.msgProvisionModel(value)
385+
const msg = await txClient.msgCertifyModel(value)
386386
const result = await txClient.signAndBroadcast([msg], {fee: { amount: fee,
387387
gas: "200000" }, memo})
388388
return result
389389
} catch (e) {
390390
if (e == MissingWalletError) {
391-
throw new SpVuexError('TxClient:MsgProvisionModel:Init', 'Could not initialize signing client. Wallet is required.')
391+
throw new SpVuexError('TxClient:MsgCertifyModel:Init', 'Could not initialize signing client. Wallet is required.')
392392
}else{
393-
throw new SpVuexError('TxClient:MsgProvisionModel:Send', 'Could not broadcast Tx: '+ e.message)
393+
throw new SpVuexError('TxClient:MsgCertifyModel:Send', 'Could not broadcast Tx: '+ e.message)
394394
}
395395
}
396396
},
@@ -410,30 +410,30 @@ export default {
410410
}
411411
},
412412

413-
async MsgCertifyModel({ rootGetters }, { value }) {
413+
async MsgProvisionModel({ rootGetters }, { value }) {
414414
try {
415415
const txClient=await initTxClient(rootGetters)
416-
const msg = await txClient.msgCertifyModel(value)
416+
const msg = await txClient.msgProvisionModel(value)
417417
return msg
418418
} catch (e) {
419419
if (e == MissingWalletError) {
420-
throw new SpVuexError('TxClient:MsgCertifyModel:Init', 'Could not initialize signing client. Wallet is required.')
420+
throw new SpVuexError('TxClient:MsgProvisionModel:Init', 'Could not initialize signing client. Wallet is required.')
421421
}else{
422-
throw new SpVuexError('TxClient:MsgCertifyModel:Create', 'Could not create message: ' + e.message)
422+
throw new SpVuexError('TxClient:MsgProvisionModel:Create', 'Could not create message: ' + e.message)
423423

424424
}
425425
}
426426
},
427-
async MsgProvisionModel({ rootGetters }, { value }) {
427+
async MsgCertifyModel({ rootGetters }, { value }) {
428428
try {
429429
const txClient=await initTxClient(rootGetters)
430-
const msg = await txClient.msgProvisionModel(value)
430+
const msg = await txClient.msgCertifyModel(value)
431431
return msg
432432
} catch (e) {
433433
if (e == MissingWalletError) {
434-
throw new SpVuexError('TxClient:MsgProvisionModel:Init', 'Could not initialize signing client. Wallet is required.')
434+
throw new SpVuexError('TxClient:MsgCertifyModel:Init', 'Could not initialize signing client. Wallet is required.')
435435
}else{
436-
throw new SpVuexError('TxClient:MsgProvisionModel:Create', 'Could not create message: ' + e.message)
436+
throw new SpVuexError('TxClient:MsgCertifyModel:Create', 'Could not create message: ' + e.message)
437437

438438
}
439439
}

‎vue/src/store/generated/zigbee-alliance/distributed-compliance-ledger/zigbeealliance.distributedcomplianceledger.compliance/module/index.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { StdFee } from "@cosmjs/launchpad";
22
import { Registry, OfflineSigner, EncodeObject } from "@cosmjs/proto-signing";
33
import { Api } from "./rest";
4-
import { MsgCertifyModel } from "./types/compliance/tx";
54
import { MsgProvisionModel } from "./types/compliance/tx";
5+
import { MsgCertifyModel } from "./types/compliance/tx";
66
import { MsgRevokeModel } from "./types/compliance/tx";
77
export declare const MissingWalletError: Error;
88
export declare const registry: Registry;
@@ -15,8 +15,8 @@ interface SignAndBroadcastOptions {
1515
}
1616
declare const txClient: (wallet: OfflineSigner, { addr: addr }?: TxClientOptions) => Promise<{
1717
signAndBroadcast: (msgs: EncodeObject[], { fee, memo }?: SignAndBroadcastOptions) => any;
18-
msgCertifyModel: (data: MsgCertifyModel) => EncodeObject;
1918
msgProvisionModel: (data: MsgProvisionModel) => EncodeObject;
19+
msgCertifyModel: (data: MsgCertifyModel) => EncodeObject;
2020
msgRevokeModel: (data: MsgRevokeModel) => EncodeObject;
2121
}>;
2222
interface QueryClientOptions {

‎vue/src/store/generated/zigbee-alliance/distributed-compliance-ledger/zigbeealliance.distributedcomplianceledger.compliance/module/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
import { SigningStargateClient } from "@cosmjs/stargate";
33
import { Registry } from "@cosmjs/proto-signing";
44
import { Api } from "./rest";
5-
import { MsgCertifyModel } from "./types/compliance/tx";
65
import { MsgProvisionModel } from "./types/compliance/tx";
6+
import { MsgCertifyModel } from "./types/compliance/tx";
77
import { MsgRevokeModel } from "./types/compliance/tx";
88
const types = [
9-
["/zigbeealliance.distributedcomplianceledger.compliance.MsgCertifyModel", MsgCertifyModel],
109
["/zigbeealliance.distributedcomplianceledger.compliance.MsgProvisionModel", MsgProvisionModel],
10+
["/zigbeealliance.distributedcomplianceledger.compliance.MsgCertifyModel", MsgCertifyModel],
1111
["/zigbeealliance.distributedcomplianceledger.compliance.MsgRevokeModel", MsgRevokeModel],
1212
];
1313
export const MissingWalletError = new Error("wallet is required");
@@ -29,8 +29,8 @@ const txClient = async (wallet, { addr: addr } = { addr: "http://localhost:26657
2929
const { address } = (await wallet.getAccounts())[0];
3030
return {
3131
signAndBroadcast: (msgs, { fee, memo } = { fee: defaultFee, memo: "" }) => client.signAndBroadcast(address, msgs, fee, memo),
32-
msgCertifyModel: (data) => ({ typeUrl: "/zigbeealliance.distributedcomplianceledger.compliance.MsgCertifyModel", value: MsgCertifyModel.fromPartial(data) }),
3332
msgProvisionModel: (data) => ({ typeUrl: "/zigbeealliance.distributedcomplianceledger.compliance.MsgProvisionModel", value: MsgProvisionModel.fromPartial(data) }),
33+
msgCertifyModel: (data) => ({ typeUrl: "/zigbeealliance.distributedcomplianceledger.compliance.MsgCertifyModel", value: MsgCertifyModel.fromPartial(data) }),
3434
msgRevokeModel: (data) => ({ typeUrl: "/zigbeealliance.distributedcomplianceledger.compliance.MsgRevokeModel", value: MsgRevokeModel.fromPartial(data) }),
3535
};
3636
};

‎vue/src/store/generated/zigbee-alliance/distributed-compliance-ledger/zigbeealliance.distributedcomplianceledger.compliance/module/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import { StdFee } from "@cosmjs/launchpad";
44
import { SigningStargateClient } from "@cosmjs/stargate";
55
import { Registry, OfflineSigner, EncodeObject, DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
66
import { Api } from "./rest";
7-
import { MsgCertifyModel } from "./types/compliance/tx";
87
import { MsgProvisionModel } from "./types/compliance/tx";
8+
import { MsgCertifyModel } from "./types/compliance/tx";
99
import { MsgRevokeModel } from "./types/compliance/tx";
1010

1111

1212
const types = [
13-
["/zigbeealliance.distributedcomplianceledger.compliance.MsgCertifyModel", MsgCertifyModel],
1413
["/zigbeealliance.distributedcomplianceledger.compliance.MsgProvisionModel", MsgProvisionModel],
14+
["/zigbeealliance.distributedcomplianceledger.compliance.MsgCertifyModel", MsgCertifyModel],
1515
["/zigbeealliance.distributedcomplianceledger.compliance.MsgRevokeModel", MsgRevokeModel],
1616

1717
];
@@ -45,8 +45,8 @@ const txClient = async (wallet: OfflineSigner, { addr: addr }: TxClientOptions =
4545

4646
return {
4747
signAndBroadcast: (msgs: EncodeObject[], { fee, memo }: SignAndBroadcastOptions = {fee: defaultFee, memo: ""}) => client.signAndBroadcast(address, msgs, fee,memo),
48-
msgCertifyModel: (data: MsgCertifyModel): EncodeObject => ({ typeUrl: "/zigbeealliance.distributedcomplianceledger.compliance.MsgCertifyModel", value: MsgCertifyModel.fromPartial( data ) }),
4948
msgProvisionModel: (data: MsgProvisionModel): EncodeObject => ({ typeUrl: "/zigbeealliance.distributedcomplianceledger.compliance.MsgProvisionModel", value: MsgProvisionModel.fromPartial( data ) }),
49+
msgCertifyModel: (data: MsgCertifyModel): EncodeObject => ({ typeUrl: "/zigbeealliance.distributedcomplianceledger.compliance.MsgCertifyModel", value: MsgCertifyModel.fromPartial( data ) }),
5050
msgRevokeModel: (data: MsgRevokeModel): EncodeObject => ({ typeUrl: "/zigbeealliance.distributedcomplianceledger.compliance.MsgRevokeModel", value: MsgRevokeModel.fromPartial( data ) }),
5151

5252
};

0 commit comments

Comments
 (0)