Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pallets/permission0/src/ext/stream_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,10 @@ fn validate_stream_permission_recipients<T: Config>(

for (recipient, weight) in recipients {
ensure!(delegator != recipient, Error::<T>::InvalidRecipientWeight);
ensure!(*weight > 0, Error::<T>::InvalidRecipientWeight);
ensure!(
revocation.is_revokable() || *weight > 0,
Error::<T>::InvalidRecipientWeight
);
ensure!(
T::Torus::is_agent_registered(recipient),
Error::<T>::NotRegisteredAgent
Expand Down
28 changes: 27 additions & 1 deletion pallets/permission0/tests/lifetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ fn irrevocable() {
let agent_1 = bob();
let agent_2 = charlie();

assert_err!(
delegate_stream_permission(
agent_0,
vec![(agent_1, 0), (agent_2, u16::MAX / 2)],
pallet_permission0_api::StreamAllocation::FixedAmount(as_tors(10)),
pallet_permission0_api::DistributionControl::Manual,
pallet_permission0_api::PermissionDuration::Indefinite,
pallet_permission0_api::RevocationTerms::Irrevocable,
pallet_permission0_api::EnforcementAuthority::None,
),
Error::<Test>::InvalidRecipientWeight
);

let permission_id = assert_ok!(delegate_stream_permission(
agent_0,
vec![(agent_1, u16::MAX / 2), (agent_2, u16::MAX / 2)],
Expand Down Expand Up @@ -81,7 +94,7 @@ fn revocable_by_delegator() {

let permission_id = assert_ok!(delegate_stream_permission(
agent_0,
vec![(agent_1, u16::MAX / 2), (agent_2, u16::MAX / 2)],
vec![(agent_1, 0), (agent_2, u16::MAX / 2)],
pallet_permission0_api::StreamAllocation::FixedAmount(as_tors(10)),
pallet_permission0_api::DistributionControl::Manual,
pallet_permission0_api::PermissionDuration::Indefinite,
Expand Down Expand Up @@ -128,6 +141,19 @@ fn revocable_after_block() {
let agent_1 = bob();
let agent_2 = charlie();

assert_err!(
delegate_stream_permission(
agent_0,
vec![(agent_1, 0), (agent_2, u16::MAX / 2)],
pallet_permission0_api::StreamAllocation::FixedAmount(as_tors(10)),
pallet_permission0_api::DistributionControl::Manual,
pallet_permission0_api::PermissionDuration::Indefinite,
pallet_permission0_api::RevocationTerms::RevocableAfter(2),
pallet_permission0_api::EnforcementAuthority::None,
),
Error::<Test>::InvalidRecipientWeight
);

let permission_id = assert_ok!(delegate_stream_permission(
agent_0,
vec![(agent_1, u16::MAX / 2), (agent_2, u16::MAX / 2)],
Expand Down
Loading