Skip to content
Open
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
6 changes: 5 additions & 1 deletion contracts/milestones/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,8 @@ mod contract {
mergefi_common::SplitError::SelfPayout => Error::SelfPayout,
mergefi_common::SplitError::Overflow => Error::ArithmeticOverflow,
})?;
let treasury: Address = mergefi_common::require_treasury::<DataKey>(&env).unwrap();
let treasury: Address =
mergefi_common::require_treasury::<DataKey>(&env).ok_or(Error::NotInitialized)?;
let token_client = token::Client::new(&env, &milestone.token);
let contract_address = env.current_contract_address();

Expand Down Expand Up @@ -828,6 +829,9 @@ mod contract {
}
} // mod contract

pub use contract::*;


/// Pays each contributor their share of `milestone.remaining_budget` (the
/// unallocated remainder of the pool), computed as
/// `remaining_budget * contribution.amount / total_budget` — i.e. in
Expand Down
28 changes: 28 additions & 0 deletions contracts/milestones/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1912,3 +1912,31 @@ fn test_release_issue_with_admin_as_recipient() {
let distributable = 950_0000000i128; // after 5% fee
assert_eq!(token_client.balance(&admin), distributable);
}

#[test]
fn test_release_issue_returns_not_initialized_if_treasury_missing() {
let env = Env::default();
env.mock_all_auths();
let (_admin, _treasury, client) = setup(&env);

let token_admin = Address::generate(&env);
let (token_addr, asset_client, _token_client) = create_token(&env, &token_admin);
let sponsor = Address::generate(&env);
asset_client.mint(&sponsor, &10_000_000_000i128);

client.create_milestone(&487u64, &sponsor, &token_addr, &10_000_000_000i128, &1_000u64);
client.allocate(&487u64, &101u64, &5_000_000_000i128);

// Remove Treasury from instance storage
env.as_contract(&client.address, || {
env.storage().instance().remove(&DataKey::Treasury);
});

let maintainer = Address::generate(&env);
let err = client.try_release_issue(
&487u64,
&101u64,
&vec![&env, (maintainer, 10_000u32)],
);
assert_eq!(err, Err(Ok(Error::NotInitialized)));
}