Skip to content

Commit e671b39

Browse files
mootz12mootz12
committed
test: update new event tests for v23
1 parent 808e774 commit e671b39

3 files changed

Lines changed: 135 additions & 101 deletions

File tree

‎soroban-sdk/src/tests/contract_event.rs‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -431,18 +431,19 @@ fn test_data_vec_preserves_field_order() {
431431
event.publish(&env);
432432
});
433433

434-
let data: Val = (1000u64, 500i128).into_val(&env);
435-
let expected_event = xdr::ContractEvent {
436-
ext: xdr::ExtensionPoint::V0,
437-
type_: xdr::ContractEventType::Contract,
438-
contract_id: Some(id.contract_id()),
439-
body: xdr::ContractEventBody::V0(xdr::ContractEventV0 {
440-
topics: vec![&env, symbol_short!("deposit"), symbol_short!("user")].into(),
441-
data: xdr::ScVal::try_from_val(&env, &data).unwrap(),
442-
}),
443-
};
444-
assert_eq!(env.events().all(), std::vec![expected_event.clone()],);
445-
assert_eq!(event.to_xdr(&env, &id), expected_event);
434+
assert_eq!(
435+
env.events().all(),
436+
vec![
437+
&env,
438+
(
439+
id,
440+
// Expect these event topics.
441+
(symbol_short!("deposit"), symbol_short!("user")).into_val(&env),
442+
// Expect this event body.
443+
(1000u64, 500i128).into_val(&env)
444+
),
445+
],
446+
);
446447
}
447448

448449
#[test]
@@ -557,29 +558,30 @@ fn test_data_map_sorts_fields() {
557558
event.publish(&env);
558559
});
559560

560-
let data: Val = map![
561-
&env,
562-
(
563-
symbol_short!("amount"),
564-
<_ as IntoVal<Env, Val>>::into_val(&500i128, &env),
565-
),
566-
(
567-
symbol_short!("time"),
568-
<_ as IntoVal<Env, Val>>::into_val(&1000u64, &env),
569-
),
570-
]
571-
.into_val(&env);
572-
let expected_event = xdr::ContractEvent {
573-
ext: xdr::ExtensionPoint::V0,
574-
type_: xdr::ContractEventType::Contract,
575-
contract_id: Some(id.contract_id()),
576-
body: xdr::ContractEventBody::V0(xdr::ContractEventV0 {
577-
topics: vec![&env, symbol_short!("deposit"), symbol_short!("user")].into(),
578-
data: xdr::ScVal::try_from_val(&env, &data).unwrap(),
579-
}),
580-
};
581-
assert_eq!(env.events().all(), std::vec![expected_event.clone()],);
582-
assert_eq!(event.to_xdr(&env, &id), expected_event);
561+
assert_eq!(
562+
env.events().all(),
563+
vec![
564+
&env,
565+
(
566+
id,
567+
// Expect these event topics.
568+
(symbol_short!("deposit"), symbol_short!("user")).into_val(&env),
569+
// Expect this event body.
570+
map![
571+
&env,
572+
(
573+
symbol_short!("amount"),
574+
<_ as IntoVal<Env, Val>>::into_val(&500i128, &env),
575+
),
576+
(
577+
symbol_short!("time"),
578+
<_ as IntoVal<Env, Val>>::into_val(&1000u64, &env),
579+
),
580+
]
581+
.into_val(&env)
582+
),
583+
],
584+
);
583585
}
584586

585587
#[test]

‎soroban-sdk/test_snapshots/tests/contract_event/test_data_map_sorts_fields.1.json‎

Lines changed: 49 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[]
1010
],
1111
"ledger": {
12-
"protocol_version": 25,
12+
"protocol_version": 23,
1313
"sequence_number": 0,
1414
"timestamp": 0,
1515
"network_id": "0000000000000000000000000000000000000000000000000000000000000000",
@@ -18,43 +18,59 @@
1818
"min_temp_entry_ttl": 16,
1919
"max_entry_ttl": 6312000,
2020
"ledger_entries": [
21-
{
22-
"entry": {
23-
"last_modified_ledger_seq": 0,
24-
"data": {
25-
"contract_data": {
26-
"ext": "v0",
27-
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
28-
"key": "ledger_key_contract_instance",
29-
"durability": "persistent",
30-
"val": {
31-
"contract_instance": {
32-
"executable": {
33-
"wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
34-
},
35-
"storage": null
21+
[
22+
{
23+
"contract_data": {
24+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
25+
"key": "ledger_key_contract_instance",
26+
"durability": "persistent"
27+
}
28+
},
29+
[
30+
{
31+
"last_modified_ledger_seq": 0,
32+
"data": {
33+
"contract_data": {
34+
"ext": "v0",
35+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
36+
"key": "ledger_key_contract_instance",
37+
"durability": "persistent",
38+
"val": {
39+
"contract_instance": {
40+
"executable": {
41+
"wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
42+
},
43+
"storage": null
44+
}
3645
}
3746
}
38-
}
47+
},
48+
"ext": "v0"
3949
},
40-
"ext": "v0"
50+
4095
51+
]
52+
],
53+
[
54+
{
55+
"contract_code": {
56+
"hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
57+
}
4158
},
42-
"live_until": 4095
43-
},
44-
{
45-
"entry": {
46-
"last_modified_ledger_seq": 0,
47-
"data": {
48-
"contract_code": {
49-
"ext": "v0",
50-
"hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
51-
"code": ""
52-
}
59+
[
60+
{
61+
"last_modified_ledger_seq": 0,
62+
"data": {
63+
"contract_code": {
64+
"ext": "v0",
65+
"hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
66+
"code": ""
67+
}
68+
},
69+
"ext": "v0"
5370
},
54-
"ext": "v0"
55-
},
56-
"live_until": 4095
57-
}
71+
4095
72+
]
73+
]
5874
]
5975
},
6076
"events": [

‎soroban-sdk/test_snapshots/tests/contract_event/test_data_vec_preserves_field_order.1.json‎

Lines changed: 49 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[]
1010
],
1111
"ledger": {
12-
"protocol_version": 25,
12+
"protocol_version": 23,
1313
"sequence_number": 0,
1414
"timestamp": 0,
1515
"network_id": "0000000000000000000000000000000000000000000000000000000000000000",
@@ -18,43 +18,59 @@
1818
"min_temp_entry_ttl": 16,
1919
"max_entry_ttl": 6312000,
2020
"ledger_entries": [
21-
{
22-
"entry": {
23-
"last_modified_ledger_seq": 0,
24-
"data": {
25-
"contract_data": {
26-
"ext": "v0",
27-
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
28-
"key": "ledger_key_contract_instance",
29-
"durability": "persistent",
30-
"val": {
31-
"contract_instance": {
32-
"executable": {
33-
"wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
34-
},
35-
"storage": null
21+
[
22+
{
23+
"contract_data": {
24+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
25+
"key": "ledger_key_contract_instance",
26+
"durability": "persistent"
27+
}
28+
},
29+
[
30+
{
31+
"last_modified_ledger_seq": 0,
32+
"data": {
33+
"contract_data": {
34+
"ext": "v0",
35+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
36+
"key": "ledger_key_contract_instance",
37+
"durability": "persistent",
38+
"val": {
39+
"contract_instance": {
40+
"executable": {
41+
"wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
42+
},
43+
"storage": null
44+
}
3645
}
3746
}
38-
}
47+
},
48+
"ext": "v0"
3949
},
40-
"ext": "v0"
50+
4095
51+
]
52+
],
53+
[
54+
{
55+
"contract_code": {
56+
"hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
57+
}
4158
},
42-
"live_until": 4095
43-
},
44-
{
45-
"entry": {
46-
"last_modified_ledger_seq": 0,
47-
"data": {
48-
"contract_code": {
49-
"ext": "v0",
50-
"hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
51-
"code": ""
52-
}
59+
[
60+
{
61+
"last_modified_ledger_seq": 0,
62+
"data": {
63+
"contract_code": {
64+
"ext": "v0",
65+
"hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
66+
"code": ""
67+
}
68+
},
69+
"ext": "v0"
5370
},
54-
"ext": "v0"
55-
},
56-
"live_until": 4095
57-
}
71+
4095
72+
]
73+
]
5874
]
5975
},
6076
"events": [

0 commit comments

Comments
 (0)