Fix linter issues

Author: ankur325

.github/workflows/go.yml

@@ -9,56 +9,7 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
-      with:
-        go-version: ^1.13
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
 
-    - name: Build
-      run: make build
-
-  unit_tests:
-    name: Unit tests
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.13
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Run units
-        run: make test
-
-  integration_tests:
-    name: Integration tests
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.13
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Run integration tests
-        run: bash integration_tests/ci/run-all.sh
 
   golangci:
     name: Lint
@@ -73,22 +24,4 @@ jobs:
           version: v1.30
           args: --timeout 5m0s
 
-  license:
-    name: License
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.13
-        id: go
-
-      - name: Get google/addlicense
-        run: go get -u github.com/google/addlicense
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Check license
-        run: make license-check
+  

.golangci.yml

@@ -5,4 +5,5 @@ linters:
     - unparam
     - gochecknoinits
     - gochecknoglobals
-    - gomnd
+    - gomnd
+    - nolintlint

docs/cli-help.md

@@ -406,12 +406,12 @@ The set of commands that allows the Vendor to update contact information.
 
   Role: `Vendor`
 
-  Command: `dclcli tx vendorinfo add-vendor --companyLegalName=<string> --companyPreferredName=<string> --vendorName=<string> --vid=<uint16> ----vendorLandingPageUrl=<url> --from=<account>`
+  Command: `dclcli tx vendorinfo add-vendor --companyLegalName=<string> --companyPreferredName=<string> --vendorName=<string> --vid=<uint16> ----vendorLandingPageURL=<url> --from=<account>`
 
   Flags:
   - companyLegalName `string (max64)` - Company Legal Name
   - companyPreferredName `optional string (max64)` - Company Preferred Name  
-  - vendorLandingPageUrl `optional string (max256)` - Landing Page URL for the Vendor
+  - vendorLandingPageURL `optional string (max256)` - Landing Page URL for the Vendor
   - vendorName `string (max32)` - Vendor Name
   - vid `uint16` - Vendor ID      
 
@@ -422,17 +422,17 @@ The set of commands that allows the Vendor to update contact information.
 
   Role: `Vendor`
 
-  Command: `dclcli tx vendorinfo update-vendor --companyLegalName=<string> --companyPreferredName=<string> --vendorName=<string> --vid=<uint16> ----vendorLandingPageUrl=<url> --from=<account>`
+  Command: `dclcli tx vendorinfo update-vendor --companyLegalName=<string> --companyPreferredName=<string> --vendorName=<string> --vid=<uint16> ----vendorLandingPageURL=<url> --from=<account>`
 
 
   Flags:
   - companyLegalName `string (max64)` - Company Legal Name
   - companyPreferredName `optional string (max64)` - Company Preferred Name  
-  - vendorLandingPageUrl `optional string (max256)` - Landing Page URL for the Vendor
+  - vendorLandingPageURL `optional string (max256)` - Landing Page URL for the Vendor
   - vendorName `string (max32)` - Vendor Name
   - vid `uint16` - Vendor ID     
 
-  Example: `dclcli tx vendorinfo update-vendor --vendorLandingPageUrl="https://producturl.vendor.info" --vid=123 --from="jack"`
+  Example: `dclcli tx vendorinfo update-vendor --vendorLandingPageURL="https://producturl.vendor.info" --vid=123 --from="jack"`
 
 ##### Queries
 - Query a single vendor info.

integration_tests/cli/auth-demo.sh

@@ -97,7 +97,7 @@ test_divider
 vidPlusOne=$((vid+1))
 echo "$user adds Model with a VID: $vidPlusOne PID: $pid, This fails with Permission denied as the VID is not associated with this vendor account."
 result=$(echo "test1234" | dclcli tx model add-model --vid=$vidPlusOne --pid=$pid --productName="$productName" --productLabel="Device Description"   --commissioningCustomFlow=0 --deviceTypeID=12 --partNumber=12 --from=$user_address --yes 2>&1) || true
-check_response_and_report "$result" "transaction should be signed by an vendor account containing the vendorId $vidPlusOne"
+check_response_and_report "$result" "transaction should be signed by an vendor account containing the vendorID $vidPlusOne"
 
 test_divider
 

integration_tests/cli/modelversion-demo.sh

@@ -94,13 +94,13 @@ different_vendor_account=vendor_account_$newvid
 create_new_vendor_account $different_vendor_account $newvid
 result=$(echo 'test1234' | dclcli tx model add-model-version --cdVersionNumber=1 --maxApplicableSoftwareVersion=10 --minApplicableSoftwareVersion=1 --vid=$vid --pid=$pid --softwareVersion=$sv --softwareVersionString=1 --from=$different_vendor_account --yes)
 check_response "$result" "\"success\": false"
-check_response_and_report "$result" "ModelVersion Add/Update transaction should be signed by an vendor account containing the vendorId $vid"
+check_response_and_report "$result" "ModelVersion Add/Update transaction should be signed by an vendor account containing the vendorID $vid"
 
 test_divider
 
 # Update model version with vid belonging to another vendor
 echo "Update a Device Model Version with VID: $vid PID: $pid SV: $sv from a different vendor account"
 result=$(echo 'test1234' | dclcli tx model update-model-version --vid=$vid --pid=$pid --minApplicableSoftwareVersion=2 --softwareVersion=$sv --softwareVersionValid=false --from=$different_vendor_account --yes)
 check_response "$result" "\"success\": false"
-check_response_and_report "$result" "ModelVersion Add/Update transaction should be signed by an vendor account containing the vendorId $vid"
+check_response_and_report "$result" "ModelVersion Add/Update transaction should be signed by an vendor account containing the vendorID $vid"
 

integration_tests/cli/vendorinfo-demo.sh

@@ -41,7 +41,7 @@ test_divider
 # Query vendor info record
 echo "Verify if VendorInfo Record for VID: $vid is present or not"
 result=$(dclcli query vendorinfo vendor --vid=$vid)
-check_response "$result" "\"vendorId\": $vid"
+check_response "$result" "\"vendorID\": $vid"
 check_response "$result" "\"companyLegalName\": \"$companyLegalName\""
 check_response "$result" "\"vendorName\": \"$vendorName\""
 echo "$result"
@@ -51,8 +51,8 @@ test_divider
 # Update vendor info record
 echo "Update vendor info record for VID: $vid"
 companyLegalName="ABC Subsidiary Corporation"
-vendorLandingPageUrl="https://www.w3.org/"
-result=$(echo "test1234" | dclcli tx vendorinfo update-vendor --vid=$vid --companyLegalName="$companyLegalName" --vendorLandingPageUrl=$vendorLandingPageUrl --vendorName="$vendorName" --from=$vendor_account --yes)
+vendorLandingPageURL="https://www.w3.org/"
+result=$(echo "test1234" | dclcli tx vendorinfo update-vendor --vid=$vid --companyLegalName="$companyLegalName" --vendorLandingPageURL=$vendorLandingPageURL --vendorName="$vendorName" --from=$vendor_account --yes)
 check_response "$result" "\"success\": true"
 echo "$result"
 
@@ -61,10 +61,10 @@ test_divider
 # Query updated vendor info record
 echo "Verify if VendorInfo Record for VID: $vid is updated or not"
 result=$(dclcli query vendorinfo vendor --vid=$vid)
-check_response "$result" "\"vendorId\": $vid"
+check_response "$result" "\"vendorID\": $vid"
 check_response "$result" "\"companyLegalName\": \"$companyLegalName\""
 check_response "$result" "\"vendorName\": \"$vendorName\""
-check_response "$result" "\"vendorLandingPageUrl\": \"$vendorLandingPageUrl\""
+check_response "$result" "\"vendorLandingPageURL\": \"$vendorLandingPageURL\""
 echo "$result"
 
 test_divider
@@ -73,13 +73,13 @@ test_divider
 vid1=$RANDOM
 result=$(echo "test1234" | dclcli tx vendorinfo add-vendor --vid=$vid1 --companyLegalName="$companyLegalName" --vendorName="$vendorName" --from=$vendor_account --yes 2>&1) || true
 echo "$result"
-check_response_and_report "$result" "transaction should be signed by an vendor account associated with the vendorId $vid1"
+check_response_and_report "$result" "transaction should be signed by an vendor account associated with the vendorID $vid1"
 
 test_divider
 
 # Update a vendor info record from a vendor account belonging to another vendor_account
 result=$(echo "test1234" | dclcli tx vendorinfo update-vendor --vid=$vid --companyLegalName="$companyLegalName" --vendorName="$vendorName" --from=$second_vendor_account --yes 2>&1) || true
 echo "$result"
-check_response_and_report "$result" "transaction should be signed by an vendor account associated with the vendorId $vid"
+check_response_and_report "$result" "transaction should be signed by an vendor account associated with the vendorID $vid"
 
 test_divider

integration_tests/constants/constants.go

@@ -38,7 +38,7 @@ var (
 	VendorName                                        = "Vendor Name"
 	CompanyLegalName                                  = "Legal Company Name"
 	CompanyPreferredName                              = "Company Preferred Name"
-	VendorLandingPageUrl                              = "https://www.example.com"
+	VendorLandingPageURL                              = "https://www.example.com"
 	PID                                        uint16 = 22
 	DeviceTypeID                               uint16 = 12345
 	Version                                           = "1.0"
@@ -89,9 +89,9 @@ var (
 	Address1, _              = sdk.AccAddressFromBech32("cosmos1p72j8mgkf39qjzcmr283w8l8y9qv30qpj056uz")
 	Address2, _              = sdk.AccAddressFromBech32("cosmos1j8x9urmqs7p44va5p4cu29z6fc3g0cx2c2vxx2")
 	Address3, _              = sdk.AccAddressFromBech32("cosmos1j7tc5f4f54fd8hns42nsavzhadr0gchddz6vfl")
-	VendorId1         uint16 = 1000
-	VendorId2         uint16 = 2000
-	VendorId3         uint16 = 3000
+	VendorID1         uint16 = 1000
+	VendorID2         uint16 = 2000
+	VendorID3         uint16 = 3000
 	Pubkey1Str               = "cosmospub1addwnpepq28rlfval9n8khmgqz55mlfwn4rlh0jk80k9n7fvtu4g4u37qtvry76ww9h"
 	PubKey1, _               = sdk.GetAccPubKeyBech32(Pubkey1Str)
 	PubKey2Str               = "cosmospub1addwnpepq086aynq08ey3nyhdvd3nma5fqyh00yuqtwzz06g6juqaqclcpqvcft9yng"

integration_tests/rest/compliance_test.go

@@ -27,16 +27,7 @@ import (
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance"
 )
 
-//nolint:godox
-/*
-	To Run test you need:
-		* Run LocalNet with: `make install && make localnet_init && make localnet_start`
-		* run RPC service with `dclcli rest-server --chain-id dclchain`
-
-	TODO: provide tests for error cases
-*/
-
-//nolint:funlen
+//nolint:funlen,lll
 func TestComplianceDemo_KeepTrackCompliance(t *testing.T) {
 	// Register new Vendor account
 	vendor := utils.CreateNewAccount(auth.AccountRoles{auth.Vendor}, testconstants.VID)
@@ -134,6 +125,7 @@ func TestComplianceDemo_KeepTrackCompliance(t *testing.T) {
 	require.Equal(t, complianceInfo.History[0].SoftwareVersionCertificationStatus, compliance.CodeCertified)
 }
 
+//nolint:funlen
 func TestComplianceDemo_KeepTrackRevocation(t *testing.T) {
 	// Register new account Vendor, CertificationCenter
 	// Publish model info
@@ -145,7 +137,8 @@ func TestComplianceDemo_KeepTrackRevocation(t *testing.T) {
 
 	// Revoke non-existent model
 	revocationTime := time.Now().UTC()
-	revokeModelMsg := compliance.NewMsgRevokeModel(common.RandUint16(), common.RandUint16(), common.RandUint32(), revocationTime,
+	revokeModelMsg := compliance.NewMsgRevokeModel(common.RandUint16(),
+		common.RandUint16(), common.RandUint32(), revocationTime,
 		compliance.CertificationType(testconstants.CertificationType), testconstants.RevocationReason, zigbee.Address)
 	_, _ = utils.PublishRevokedModel(revokeModelMsg, zigbee)
 

integration_tests/rest/compliancetest_test.go

@@ -23,15 +23,13 @@ import (
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/auth"
 )
 
-//nolint:godox
 /*
 	To Run test you need:
 		* Run LocalNet with: `make install && make localnet_init && make localnet_start`
 		* run RPC service with `dclcli rest-server --chain-id dclchain`
-
-	TODO: provide tests for error cases
 */
 
+//nolint:funlen
 func TestCompliancetestDemo(t *testing.T) {
 	// Register new Vendor account
 	vendor := utils.CreateNewAccount(auth.AccountRoles{auth.Vendor}, testconstants.VID)
@@ -51,11 +49,13 @@ func TestCompliancetestDemo(t *testing.T) {
 	_, _ = utils.AddModelVersion(modelVersion, vendor)
 
 	// Publish first testing result using Sign and Broadcast AddTestingResult message
-	firstTestingResult := utils.NewMsgAddTestingResult(model.VID, model.PID, modelVersion.SoftwareVersion, modelVersion.SoftwareVersionString, testHouse.Address)
+	firstTestingResult := utils.NewMsgAddTestingResult(model.VID, model.PID,
+		modelVersion.SoftwareVersion, modelVersion.SoftwareVersionString, testHouse.Address)
 	utils.SignAndBroadcastMessage(testHouse, firstTestingResult)
 
 	// Check testing result is created
-	receivedTestingResult, _ := utils.GetTestingResult(firstTestingResult.VID, firstTestingResult.PID, firstTestingResult.SoftwareVersion)
+	receivedTestingResult, _ := utils.GetTestingResult(firstTestingResult.VID,
+		firstTestingResult.PID, firstTestingResult.SoftwareVersion)
 	require.Equal(t, receivedTestingResult.VID, firstTestingResult.VID)
 	require.Equal(t, receivedTestingResult.PID, firstTestingResult.PID)
 	require.Equal(t, receivedTestingResult.SoftwareVersion, firstTestingResult.SoftwareVersion)
@@ -78,7 +78,8 @@ func TestCompliancetestDemo(t *testing.T) {
 	_, _ = utils.PublishTestingResult(secondTestingResult, testHouse)
 
 	// Check testing result is created
-	receivedTestingResult, _ = utils.GetTestingResult(secondTestingResult.VID, secondTestingResult.PID, secondTestingResult.SoftwareVersion)
+	receivedTestingResult, _ = utils.GetTestingResult(secondTestingResult.VID,
+		secondTestingResult.PID, secondTestingResult.SoftwareVersion)
 	require.Equal(t, receivedTestingResult.VID, secondTestingResult.VID)
 	require.Equal(t, receivedTestingResult.PID, secondTestingResult.PID)
 	require.Equal(t, receivedTestingResult.SoftwareVersion, secondTestingResult.SoftwareVersion)
@@ -93,7 +94,8 @@ func TestCompliancetestDemo(t *testing.T) {
 	_, _ = utils.PublishTestingResult(thirdTestingResult, secondTestHouse)
 
 	// Check testing result is created
-	receivedTestingResult, _ = utils.GetTestingResult(secondTestingResult.VID, secondTestingResult.PID, secondTestingResult.SoftwareVersion)
+	receivedTestingResult, _ = utils.GetTestingResult(secondTestingResult.VID,
+		secondTestingResult.PID, secondTestingResult.SoftwareVersion)
 	require.Equal(t, 2, len(receivedTestingResult.Results))
 	require.Equal(t, receivedTestingResult.Results[0].Owner, secondTestingResult.Signer)
 	require.Equal(t, receivedTestingResult.Results[0].TestResult, secondTestingResult.TestResult)

integration_tests/utils/client.go

@@ -68,6 +68,7 @@ func sendRequest(uri string, method string, body []byte, account string, passphr
 	resp, err := client.Do(req)
 	if err != nil {
 		fmt.Printf("Error received from server: %v", err)
+
 		return nil, http.StatusInternalServerError
 	}
 

integration_tests/utils/requests.go

@@ -68,7 +68,7 @@ func GetKeyInfo(accountName string) (KeyInfo, int) {
 	return keyInfo, code
 }
 
-func ProposeAddAccount(keyInfo KeyInfo, signer KeyInfo, roles auth.AccountRoles, vendorId uint16) (TxnResponse, int) {
+func ProposeAddAccount(keyInfo KeyInfo, signer KeyInfo, roles auth.AccountRoles, vendorID uint16) (TxnResponse, int) {
 	println("Propose Add Account for: ", keyInfo.Name)
 
 	request := authRest.ProposeAddAccountRequest{
@@ -79,7 +79,7 @@ func ProposeAddAccount(keyInfo KeyInfo, signer KeyInfo, roles auth.AccountRoles,
 		Address:  keyInfo.Address,
 		Pubkey:   keyInfo.PublicKey,
 		Roles:    roles,
-		VendorId: vendorId,
+		VendorID: vendorID,
 	}
 
 	body, _ := codec.MarshalJSONIndent(app.MakeCodec(), request)
@@ -201,7 +201,7 @@ func GetProposedAccountsToRevoke() (ProposedAccountToRevokeHeadersResult, int) {
 	return result, code
 }
 
-func CreateNewAccount(roles auth.AccountRoles, vendorId uint16) KeyInfo {
+func CreateNewAccount(roles auth.AccountRoles, vendorID uint16) KeyInfo {
 	name := RandString()
 	println("Register new account on the ledger: ", name)
 
@@ -210,7 +210,7 @@ func CreateNewAccount(roles auth.AccountRoles, vendorId uint16) KeyInfo {
 
 	keyInfo, _ := CreateKey(name)
 
-	ProposeAddAccount(keyInfo, jackKeyInfo, roles, vendorId)
+	ProposeAddAccount(keyInfo, jackKeyInfo, roles, vendorID)
 	ApproveAddAccount(keyInfo, aliceKeyInfo)
 
 	return keyInfo
@@ -540,7 +540,8 @@ func SendCertifiedModelRequest(certifyModel compliance.MsgCertifyModel, name str
 	body, _ := codec.MarshalJSONIndent(app.MakeCodec(), request)
 
 	uri := fmt.Sprintf("%s/%v/%v/%v/%v/%v/%v", compliance.RouterKey, compliance.Certified,
-		certifyModel.VID, certifyModel.PID, certifyModel.SoftwareVersion, certifyModel.SoftwareVersionString, certifyModel.CertificationType)
+		certifyModel.VID, certifyModel.PID, certifyModel.SoftwareVersion,
+		certifyModel.SoftwareVersionString, certifyModel.CertificationType)
 
 	return SendPutRequest(uri, body, name, constants.Passphrase)
 }
@@ -613,7 +614,8 @@ func getComplianceInfo(vid uint16, pid uint16, softwareVersion uint32,
 }
 
 func getComplianceInfoInState(vid uint16, pid uint16, softwareVersion uint32,
-	certificationType compliance.CertificationType, state compliance.ComplianceState) (compliance.ComplianceInfoInState, int) {
+	certificationType compliance.CertificationType,
+	state compliance.ComplianceState) (compliance.ComplianceInfoInState, int) {
 	uri := fmt.Sprintf("%s/%v/%v/%v/%v/%v", compliance.RouterKey, state, vid, pid, softwareVersion, certificationType)
 
 	response, code := SendGetRequest(uri)
@@ -1131,7 +1133,8 @@ func InitStartData() (KeyInfo, KeyInfo, model.MsgAddModel, model.MsgAddModelVers
 	fmt.Printf("%v, %v", txnResponse, errCode)
 
 	// Publish model version
-	modelVersion := NewMsgAddModelVersion(model.VID, model.PID, constants.SoftwareVersion, constants.SoftwareVersionString, vendor.Address)
+	modelVersion := NewMsgAddModelVersion(model.VID, model.PID,
+		constants.SoftwareVersion, constants.SoftwareVersionString, vendor.Address)
 	txnResponse, errCode = AddModelVersion(modelVersion, vendor)
 	fmt.Printf("%v, %v", txnResponse, errCode)