Skip to content

Commit 3640f32

Browse files
AbdulboisAbdulbois
committed
Fix linter error
Signed-off-by: Abdulbois <abdulbois.tursunov@dsr-corporation.com> Signed-off-by: Abdulbois <abdulbois123@gmail.com>
1 parent 5e3589a commit 3640f32

6 files changed

+21
-16
lines changed

‎integration_tests/constants/noc_constants.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ F5UqAiEAshHfXxUpdfxqiLoTjQjkNf0AHVYBFhLdB+iIFspwTyg=
4848
`
4949

5050
NocRootCert1Subject = "MFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDjAMBgNVBAMMBU5PQy0x"
51-
NocRootCert1SubjectKeyId = "44:EB:4C:62:6B:25:48:CD:A2:B3:1C:87:41:5A:08:E7:2B:B9:83:26"
51+
NocRootCert1SubjectKeyID = "44:EB:4C:62:6B:25:48:CD:A2:B3:1C:87:41:5A:08:E7:2B:B9:83:26"
5252
NocRootCert1SerialNumber = "217369606639495620450806539821422258966012867792"
5353
NocRootCert1SubjectAsText = "CN=NOC-1,O=Internet Widgits Pty Ltd,ST=Some-State,C=AU"
5454

5555
NocRootCert2Subject = "MFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDjAMBgNVBAMMBU5PQy0y"
56-
NocRootCert2SubjectKeyId = "CF:E6:DD:37:2B:4C:B2:B9:A9:F2:75:30:1C:AA:B1:37:1B:11:7F:1B"
56+
NocRootCert2SubjectKeyID = "CF:E6:DD:37:2B:4C:B2:B9:A9:F2:75:30:1C:AA:B1:37:1B:11:7F:1B"
5757
NocRootCert2SerialNumber = "720401643293243343104681760462974770802745092176"
5858
NocRootCert2SubjectAsText = "CN=NOC-2,O=Internet Widgits Pty Ltd,ST=Some-State,C=AU"
5959

6060
NocRootCert3Subject = "MFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDjAMBgNVBAMMBU5PQy0z"
61-
NocRootCert3SubjectKeyId = "88:0D:06:D9:64:22:29:34:78:7F:8C:3B:AE:F5:08:93:86:8F:0D:20"
61+
NocRootCert3SubjectKeyID = "88:0D:06:D9:64:22:29:34:78:7F:8C:3B:AE:F5:08:93:86:8F:0D:20"
6262
NocRootCert3SerialNumber = "38457288443253426021793906708335409501754677187"
6363
NocRootCert3SubjectAsText = "CN=NOC-3,O=Internet Widgits Pty Ltd,ST=Some-State,C=AU"
6464
)

‎integration_tests/grpc_rest/pki/noc_cert_helper.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ func NocCertDemo(suite *utils.TestSuite) {
169169
nocCertificates, _ := GetNocX509RootCerts(suite, vid1)
170170
require.Equal(suite.T, 2, len(nocCertificates.Certs))
171171
require.Equal(suite.T, testconstants.NocRootCert1Subject, nocCertificates.Certs[0].Subject)
172-
require.Equal(suite.T, testconstants.NocRootCert1SubjectKeyId, nocCertificates.Certs[0].SubjectKeyId)
172+
require.Equal(suite.T, testconstants.NocRootCert1SubjectKeyID, nocCertificates.Certs[0].SubjectKeyId)
173173
require.Equal(suite.T, testconstants.NocRootCert2Subject, nocCertificates.Certs[1].Subject)
174-
require.Equal(suite.T, testconstants.NocRootCert2SubjectKeyId, nocCertificates.Certs[1].SubjectKeyId)
174+
require.Equal(suite.T, testconstants.NocRootCert2SubjectKeyID, nocCertificates.Certs[1].SubjectKeyId)
175175

176176
// Request All NOC root certificate
177177
allNocCertificates, _ = GetAllNocX509RootCerts(suite)
@@ -193,16 +193,16 @@ func NocCertDemo(suite *utils.TestSuite) {
193193
require.Equal(suite.T, 2, len(certsWithVid1))
194194
require.Equal(suite.T, 1, len(certsWithVid2))
195195
require.Equal(suite.T, testconstants.NocRootCert1Subject, certsWithVid1[0].Subject)
196-
require.Equal(suite.T, testconstants.NocRootCert1SubjectKeyId, certsWithVid1[0].SubjectKeyId)
196+
require.Equal(suite.T, testconstants.NocRootCert1SubjectKeyID, certsWithVid1[0].SubjectKeyId)
197197
require.Equal(suite.T, testconstants.NocRootCert2Subject, certsWithVid1[1].Subject)
198-
require.Equal(suite.T, testconstants.NocRootCert2SubjectKeyId, certsWithVid1[1].SubjectKeyId)
198+
require.Equal(suite.T, testconstants.NocRootCert2SubjectKeyID, certsWithVid1[1].SubjectKeyId)
199199
require.Equal(suite.T, testconstants.NocRootCert3Subject, certsWithVid2[0].Subject)
200-
require.Equal(suite.T, testconstants.NocRootCert3SubjectKeyId, certsWithVid2[0].SubjectKeyId)
200+
require.Equal(suite.T, testconstants.NocRootCert3SubjectKeyID, certsWithVid2[0].SubjectKeyId)
201201

202202
// Request NOC root certificate by Subject and SubjectKeyID
203-
certificate, _ := GetX509Cert(suite, testconstants.NocRootCert1Subject, testconstants.NocRootCert1SubjectKeyId)
203+
certificate, _ := GetX509Cert(suite, testconstants.NocRootCert1Subject, testconstants.NocRootCert1SubjectKeyID)
204204
require.Equal(suite.T, testconstants.NocRootCert1Subject, certificate.Subject)
205-
require.Equal(suite.T, testconstants.NocRootCert1SubjectKeyId, certificate.SubjectKeyId)
205+
require.Equal(suite.T, testconstants.NocRootCert1SubjectKeyID, certificate.SubjectKeyId)
206206
require.Equal(suite.T, testconstants.NocRootCert1SubjectAsText, certificate.Certs[0].SubjectAsText)
207207
require.Equal(suite.T, 1, len(certificate.Certs))
208208
require.Equal(suite.T, testconstants.NocRootCert1, certificate.Certs[0].PemCert)
@@ -213,13 +213,13 @@ func NocCertDemo(suite *utils.TestSuite) {
213213
subjectCertificates, _ := GetAllX509CertsBySubject(suite, testconstants.NocRootCert1Subject)
214214
require.Equal(suite.T, testconstants.NocRootCert1Subject, subjectCertificates.Subject)
215215
require.Equal(suite.T, 1, len(subjectCertificates.SubjectKeyIds))
216-
require.Equal(suite.T, testconstants.NocRootCert1SubjectKeyId, subjectCertificates.SubjectKeyIds[0])
216+
require.Equal(suite.T, testconstants.NocRootCert1SubjectKeyID, subjectCertificates.SubjectKeyIds[0])
217217

218218
// Request NOC root certificate by SubjectKeyID
219-
certsBySubjectKeyID, _ := GetAllX509certsBySubjectKeyID(suite, testconstants.NocRootCert1SubjectKeyId)
219+
certsBySubjectKeyID, _ := GetAllX509certsBySubjectKeyID(suite, testconstants.NocRootCert1SubjectKeyID)
220220
require.Equal(suite.T, 1, len(certsBySubjectKeyID))
221221
require.Equal(suite.T, 1, len(certsBySubjectKeyID[0].Certs))
222-
require.Equal(suite.T, testconstants.NocRootCert1SubjectKeyId, certsBySubjectKeyID[0].Certs[0].SubjectKeyId)
222+
require.Equal(suite.T, testconstants.NocRootCert1SubjectKeyID, certsBySubjectKeyID[0].Certs[0].SubjectKeyId)
223223
require.Equal(suite.T, testconstants.NocRootCert1Subject, certsBySubjectKeyID[0].Certs[0].Subject)
224224
require.Equal(suite.T, testconstants.NocRootCert1SubjectAsText, certsBySubjectKeyID[0].Certs[0].SubjectAsText)
225225
}

‎x/pki/keeper/grpc_query_noc_root_certificates.go

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ func (k Keeper) NocRootCertificatesAll(c context.Context, req *types.QueryAllNoc
3030
}
3131

3232
nocRootCertificatess = append(nocRootCertificatess, nocRootCertificates)
33+
3334
return nil
3435
})
3536

‎x/pki/keeper/noc_root_certificates.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/zigbee-alliance/distributed-compliance-ledger/x/pki/types"
88
)
99

10-
// SetNocRootCertificates set a specific nocRootCertificates in the store from its index
10+
// SetNocRootCertificates set a specific nocRootCertificates in the store from its index.
1111
func (k Keeper) SetNocRootCertificates(ctx sdk.Context, nocRootCertificates types.NocRootCertificates) {
1212
store := prefix.NewStore(ctx.KVStore(k.storeKey), pkitypes.KeyPrefix(types.NocRootCertificatesKeyPrefix))
1313
b := k.cdc.MustMarshal(&nocRootCertificates)
@@ -16,7 +16,7 @@ func (k Keeper) SetNocRootCertificates(ctx sdk.Context, nocRootCertificates type
1616
), b)
1717
}
1818

19-
// GetNocRootCertificates returns a nocRootCertificates from its index
19+
// GetNocRootCertificates returns a nocRootCertificates from its index.
2020
func (k Keeper) GetNocRootCertificates(
2121
ctx sdk.Context,
2222
vid int32,
@@ -32,6 +32,7 @@ func (k Keeper) GetNocRootCertificates(
3232
}
3333

3434
k.cdc.MustUnmarshal(b, &val)
35+
3536
return val, true
3637
}
3738

@@ -57,7 +58,7 @@ func (k Keeper) AddNocRootCertificate(ctx sdk.Context, nocCertificate types.Cert
5758
store.Set(types.NocRootCertificatesKey(nocCertificate.Vid), b)
5859
}
5960

60-
// RemoveNocRootCertificates removes a nocRootCertificates from the store
61+
// RemoveNocRootCertificates removes a nocRootCertificates from the store.
6162
func (k Keeper) RemoveNocRootCertificates(
6263
ctx sdk.Context,
6364
vid int32,

‎x/pki/keeper/noc_root_certificates_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ func createNNocRootCertificates(keeper *keeper.Keeper, ctx sdk.Context, n int) [
2222

2323
keeper.SetNocRootCertificates(ctx, items[i])
2424
}
25+
2526
return items
2627
}
2728

‎x/pki/types/message_add_noc_x_509_root_cert.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ func (msg *MsgAddNocX509RootCert) GetSigners() []sdk.AccAddress {
3232
if err != nil {
3333
panic(err)
3434
}
35+
3536
return []sdk.AccAddress{signer}
3637
}
3738

3839
func (msg *MsgAddNocX509RootCert) GetSignBytes() []byte {
3940
bz := ModuleCdc.MustMarshalJSON(msg)
41+
4042
return sdk.MustSortJSON(bz)
4143
}
4244

0 commit comments

Comments
 (0)