From 09de6f47f3534bac835cd6505e3ee64168fe91d0 Mon Sep 17 00:00:00 2001 From: Adam Dossa Date: Tue, 17 Jan 2023 11:24:52 +0000 Subject: [PATCH] MESH-1882: Allow non-zero priority (#1377) * Allow non-zero priority * Clean up comment * Update to golang 1.17 --- .circleci/config.yml | 2 +- Cargo.lock | 2 +- pallets/compliance-manager/src/lib.rs | 2 +- pallets/runtime/extensions/src/check_weight.rs | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bf185cc629..470d03cfa1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -462,7 +462,7 @@ jobs: docker push --all-tags $IMAGE_NAME publish-github-release: docker: - - image: circleci/golang:1.16 + - image: circleci/golang:1.17 steps: - attach_workspace: at: ./assets diff --git a/Cargo.lock b/Cargo.lock index f7afbbe00d..878aa03122 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6277,7 +6277,7 @@ dependencies = [ [[package]] name = "polymesh" -version = "5.1.2" +version = "5.1.3" dependencies = [ "chrono", "clap 3.2.22", diff --git a/pallets/compliance-manager/src/lib.rs b/pallets/compliance-manager/src/lib.rs index 7107a91730..8a10296c5a 100644 --- a/pallets/compliance-manager/src/lib.rs +++ b/pallets/compliance-manager/src/lib.rs @@ -176,7 +176,7 @@ decl_module! { const MaxConditionComplexity: u32 = T::MaxConditionComplexity::get(); /// Adds a compliance requirement to an asset's compliance by ticker. - /// If the compliance requirement is a duplicate, it does nothing. + /// If there are duplicate ClaimTypes for a particular trusted issuer, duplicates are removed. /// /// # Arguments /// * origin - Signer of the dispatchable. It should be the owner of the ticker diff --git a/pallets/runtime/extensions/src/check_weight.rs b/pallets/runtime/extensions/src/check_weight.rs index 48841909ba..9eeaf6be27 100644 --- a/pallets/runtime/extensions/src/check_weight.rs +++ b/pallets/runtime/extensions/src/check_weight.rs @@ -45,10 +45,8 @@ where /// Do the validate checks. This can be applied to both signed and unsigned. /// /// It only checks that the block weight and length limit will not exceed. - /// NOTE The returned transaction priority is 0 on success. fn do_validate(info: &DispatchInfoOf, len: usize) -> TransactionValidity { - let mut tv = CW::::do_validate(info, len)?; - tv.priority = 0; + let tv = CW::::do_validate(info, len)?; Ok(tv) } }