Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
11 changes: 8 additions & 3 deletions contracts/geev-core/src/mutual_aid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ pub struct HelpRequestPosted {
goal: i128,
}

#[contractevent]
/// Emitted after a donation is escrowed and request totals are updated. Topics are
/// `aid`, `donate`, and `request_id`; data is `[donor, amount_donated, new_total_raised]`.
#[contractevent(topics = ["aid", "donate"], data_format = "vec")]
pub struct DonationReceived {
#[topic]
request_id: u64,
donor: Address,
amount: i128,
amount_donated: i128,
new_total_raised: i128,
}

#[contractevent]
Expand Down Expand Up @@ -124,7 +128,8 @@ impl MutualAidContract {
DonationReceived {
request_id,
donor,
amount,
amount_donated: amount,
new_total_raised: new_raised,
}
.publish(&env);
}
Expand Down
11 changes: 8 additions & 3 deletions contracts/geev-core/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::types::{DataKey, HelpRequest, HelpRequestStatus};
use soroban_sdk::symbol_short;
use soroban_sdk::{
testutils::{Address as _, Events as _, Ledger},
token, Address, Env, IntoVal, String, Symbol,
token, vec, Address, Env, IntoVal, String,
};

#[test]
Expand Down Expand Up @@ -348,9 +348,14 @@ fn test_donation_emits_contributor_tracking_event() {
contract_client.donate(&donor, &request_id, &donation);

let events = env.events().all();
let expected_topics = vec![
&env,
symbol_short!("aid"),
symbol_short!("donate"),
request_id.into_val(&env),
];
assert!(events.iter().any(|(event_contract, topics, _data)| {
event_contract == contract_id
&& topics == (Symbol::new(&env, "donation_received"),).into_val(&env)
event_contract == contract_id && topics == expected_topics.into_val(&env)
}));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -731,34 +731,25 @@
"v0": {
"topics": [
{
"symbol": "donation_received"
"symbol": "aid"
},
{
"symbol": "donate"
},
{
"u64": "42"
}
],
"data": {
"map": [
"vec": [
{
"key": {
"symbol": "amount"
},
"val": {
"i128": "125"
}
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
},
{
"key": {
"symbol": "donor"
},
"val": {
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
}
"i128": "125"
},
{
"key": {
"symbol": "request_id"
},
"val": {
"u64": "42"
}
"i128": "125"
}
]
}
Expand Down
Loading