Merge pull request #1379 from oasisprotocol/ptrus/bugfix/priority

runtime-sdk: set priority instead of increasing it

runtime-sdk/src/modules/accounts/mod.rs

@@ -927,11 +927,11 @@ impl module::TransactionHandler for Module {
             // TODO: Emit event that fee has been paid.
 
             let gas_price = tx.auth_info.fee.gas_price();
-            // Bump transaction priority.
-            <C::Runtime as Runtime>::Core::add_priority(
+            // Set transaction priority.
+            <C::Runtime as Runtime>::Core::set_priority(
                 ctx,
                 gas_price.try_into().unwrap_or(u64::MAX),
-            )?;
+            );
         }
 
         // Do not update nonces early during transaction checks. In case of checks, only do it after

runtime-sdk/src/modules/core/mod.rs

@@ -268,8 +268,8 @@ pub trait API {
     /// Configured minimum gas price.
     fn min_gas_price<C: Context>(ctx: &mut C, denom: &token::Denomination) -> u128;
 
-    /// Increase transaction priority for the provided amount.
-    fn add_priority<C: Context>(ctx: &mut C, priority: u64) -> Result<(), Error>;
+    /// Sets the transaction priority to the provided amount.
+    fn set_priority<C: Context>(ctx: &mut C, priority: u64);
 
     /// Takes and returns the stored transaction priority.
     fn take_priority<C: Context>(ctx: &mut C) -> u64;
@@ -451,13 +451,8 @@ impl<Cfg: Config> API for Module<Cfg> {
             .unwrap_or_default()
     }
 
-    fn add_priority<C: Context>(ctx: &mut C, priority: u64) -> Result<(), Error> {
-        let p = ctx.value::<u64>(CONTEXT_KEY_PRIORITY).or_default();
-        let added_p = p.checked_add(priority).unwrap_or(u64::MAX);
-
-        ctx.value::<u64>(CONTEXT_KEY_PRIORITY).set(added_p);
-
-        Ok(())
+    fn set_priority<C: Context>(ctx: &mut C, priority: u64) {
+        ctx.value::<u64>(CONTEXT_KEY_PRIORITY).set(priority);
     }
 
     fn take_priority<C: Context>(ctx: &mut C) -> u64 {

runtime-sdk/src/modules/core/test.rs

@@ -834,7 +834,7 @@ fn test_approve_unverified_tx() {
 }
 
 #[test]
-fn test_add_priority() {
+fn test_set_priority() {
     let mut mock = mock::Mock::default();
     let mut ctx = mock.create_ctx();
 
@@ -844,34 +844,18 @@ fn test_add_priority() {
         "default priority should be 0"
     );
 
-    Core::add_priority(&mut ctx, 1).expect("adding priority should succeed");
-    Core::add_priority(&mut ctx, 11).expect("adding priority should succeed");
+    Core::set_priority(&mut ctx, 1);
+    Core::set_priority(&mut ctx, 11);
 
     let tx = mock::transaction();
     ctx.with_tx(0, 0, tx, |mut tx_ctx, _call| {
-        Core::add_priority(&mut tx_ctx, 10)
-            .expect("adding priority from tx context should succeed");
+        Core::set_priority(&mut tx_ctx, 10);
     });
 
     assert_eq!(
-        22,
+        10,
         Core::take_priority(&mut ctx),
-        "adding priority should work"
-    );
-}
-
-#[test]
-fn test_add_priority_overflow() {
-    let mut mock = mock::Mock::default();
-    let mut ctx = mock.create_ctx();
-
-    Core::add_priority(&mut ctx, u64::MAX).expect("adding priority should succeed");
-    Core::add_priority(&mut ctx, u64::MAX).expect("adding priority should succeed");
-
-    assert_eq!(
-        u64::MAX,
-        Core::take_priority(&mut ctx),
-        "adding priority should work"
+        "setting priority should work"
     );
 }