From 754d8bc57dff5491cb008ee6ec8ab5c68a9ea8c2 Mon Sep 17 00:00:00 2001 From: Sergej Sakac Date: Sun, 29 Jan 2023 18:05:42 +0100 Subject: [PATCH 1/3] Calling proxy doesn't remove announcement --- frame/proxy/src/lib.rs | 2 -- frame/proxy/src/tests.rs | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs index d98534d16a21b..dfe8c86ca5097 100644 --- a/frame/proxy/src/lib.rs +++ b/frame/proxy/src/lib.rs @@ -183,8 +183,6 @@ pub mod pallet { /// Dispatch the given `call` from an account that the sender is authorised for through /// `add_proxy`. /// - /// Removes any corresponding announcement(s). - /// /// The dispatch origin for this call must be _Signed_. /// /// Parameters: diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs index 3eb3ab3705332..31c3a0cde7ced 100644 --- a/frame/proxy/src/tests.rs +++ b/frame/proxy/src/tests.rs @@ -288,6 +288,20 @@ fn announcer_must_be_proxy() { }); } +#[test] +fn calling_proxy_doesnt_remove_announcement() { + new_test_ext().execute_with(|| { + assert_ok!(Proxy::add_proxy(RuntimeOrigin::signed(1), 2, ProxyType::Any, 0)); + let call = Box::new(call_transfer(6, 1)); + let call_hash = BlakeTwo256::hash_of(&call); + assert_ok!(Proxy::announce(RuntimeOrigin::signed(2), 1, call_hash)); + assert_ok!(Proxy::proxy(RuntimeOrigin::signed(2), 1, None, call)); + let announcements = Announcements::::get(2); + // The announcement is not removed by calling proxy. + assert_eq!(announcements.0, vec![Announcement { real: 1, call_hash, height: 1 }]); + }); +} + #[test] fn delayed_requires_pre_announcement() { new_test_ext().execute_with(|| { From 4352ccf9bb81411adcc584541c8decf3940d51ff Mon Sep 17 00:00:00 2001 From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> Date: Mon, 30 Jan 2023 19:15:17 +0100 Subject: [PATCH 2/3] Update frame/proxy/src/tests.rs Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> --- frame/proxy/src/tests.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs index 31c3a0cde7ced..ab3425220f44c 100644 --- a/frame/proxy/src/tests.rs +++ b/frame/proxy/src/tests.rs @@ -292,12 +292,15 @@ fn announcer_must_be_proxy() { fn calling_proxy_doesnt_remove_announcement() { new_test_ext().execute_with(|| { assert_ok!(Proxy::add_proxy(RuntimeOrigin::signed(1), 2, ProxyType::Any, 0)); + let call = Box::new(call_transfer(6, 1)); let call_hash = BlakeTwo256::hash_of(&call); + assert_ok!(Proxy::announce(RuntimeOrigin::signed(2), 1, call_hash)); assert_ok!(Proxy::proxy(RuntimeOrigin::signed(2), 1, None, call)); - let announcements = Announcements::::get(2); + // The announcement is not removed by calling proxy. + let announcements = Announcements::::get(2); assert_eq!(announcements.0, vec![Announcement { real: 1, call_hash, height: 1 }]); }); } From ca31932cddcc24ca3e5bbc883b7c132f1e026b6c Mon Sep 17 00:00:00 2001 From: Sergej Sakac Date: Wed, 1 Feb 2023 16:22:46 +0100 Subject: [PATCH 3/3] fmt --- frame/proxy/src/tests.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs index ab3425220f44c..0e7db3512f15b 100644 --- a/frame/proxy/src/tests.rs +++ b/frame/proxy/src/tests.rs @@ -292,10 +292,10 @@ fn announcer_must_be_proxy() { fn calling_proxy_doesnt_remove_announcement() { new_test_ext().execute_with(|| { assert_ok!(Proxy::add_proxy(RuntimeOrigin::signed(1), 2, ProxyType::Any, 0)); - + let call = Box::new(call_transfer(6, 1)); let call_hash = BlakeTwo256::hash_of(&call); - + assert_ok!(Proxy::announce(RuntimeOrigin::signed(2), 1, call_hash)); assert_ok!(Proxy::proxy(RuntimeOrigin::signed(2), 1, None, call));