Skip to content

Commit f75fada

Browse files
emarkeesemarkees
authored
SDK AnchorDID fixed (#463)
* SDK AnchorDID fixed * fix(contracts): standardize init events and stabilize integration test assertions
1 parent e919b3f commit f75fada

133 files changed

Lines changed: 25146 additions & 460 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎contracts/credit-oracle/src/lib.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pub use credit_oracle_types::{PendingWeightsRecord, ScoringWeights};
33
use soroban_sdk::{
44
contract, contracterror, contractimpl, contracttype, symbol_short, Address, BytesN, Env,
5-
IntoVal, Symbol, TryFromVal, Val, Vec,
5+
IntoVal, String, Symbol, TryFromVal, Val, Vec,
66
};
77

88
pub const MIN_SCORE: u32 = 300;
@@ -86,8 +86,6 @@ pub enum DataKey {
8686
FeedersIndex,
8787
/// Index of all registered lenders
8888
LendersIndex,
89-
/// Storage version for migration tracking
90-
StorageVersion,
9189
/// Dispute record for a (subject, input_key) pair
9290
Dispute(Address, Symbol),
9391
/// Index of all disputed input keys for a subject
@@ -308,6 +306,8 @@ impl CreditOracle {
308306
env.storage()
309307
.instance()
310308
.set(&DataKey::StorageVersion, &2u32);
309+
env.events()
310+
.publish((symbol_short!("Init"),), admin.clone());
311311
Ok(())
312312
}
313313

@@ -584,7 +584,6 @@ impl CreditOracle {
584584
.extend_ttl(&key, PERS_TTL_THRESHOLD, PERS_TTL_EXTEND);
585585
}
586586
}
587-
let record_key = DataKey::RepaymentRecord(subject);
588587
env.storage()
589588
.instance()
590589
.set(&DataKey::StorageVersion, &2u32);
@@ -724,7 +723,7 @@ impl CreditOracle {
724723
is_first_computation = false;
725724
}
726725

727-
let is_first = !env
726+
let _is_first = !env
728727
.storage()
729728
.persistent()
730729
.has(&DataKey::Score(subject.clone()));
@@ -1784,8 +1783,9 @@ mod tests {
17841783
let contract_id = env.register_contract(None, CreditOracle);
17851784
let client = CreditOracleClient::new(&env, &contract_id);
17861785

1786+
let identity_oracle_id = env.register_contract(None, identity_oracle::IdentityOracle);
1787+
17871788
let admin = Address::generate(&env);
1788-
let identity_oracle_id = Address::generate(&env);
17891789

17901790
client.initialize(&admin);
17911791

‎contracts/credit-oracle/test_snapshots/tests/test_admin_transfer_two_step.1.json‎

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,49 @@
9696
"min_temp_entry_ttl": 16,
9797
"max_entry_ttl": 6312000,
9898
"ledger_entries": [
99+
[
100+
{
101+
"contract_data": {
102+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
103+
"key": {
104+
"vec": [
105+
{
106+
"symbol": "FeedersIndex"
107+
}
108+
]
109+
},
110+
"durability": "persistent"
111+
}
112+
},
113+
[
114+
{
115+
"last_modified_ledger_seq": 0,
116+
"data": {
117+
"contract_data": {
118+
"ext": "v0",
119+
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
120+
"key": {
121+
"vec": [
122+
{
123+
"symbol": "FeedersIndex"
124+
}
125+
]
126+
},
127+
"durability": "persistent",
128+
"val": {
129+
"vec": [
130+
{
131+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
132+
}
133+
]
134+
}
135+
}
136+
},
137+
"ext": "v0"
138+
},
139+
518400
140+
]
141+
],
99142
[
100143
{
101144
"contract_data": {
@@ -138,7 +181,7 @@
138181
},
139182
"ext": "v0"
140183
},
141-
4095
184+
518400
142185
]
143186
],
144187
[
@@ -176,6 +219,18 @@
176219
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
177220
}
178221
},
222+
{
223+
"key": {
224+
"vec": [
225+
{
226+
"symbol": "ComputeCooldownLedgers"
227+
}
228+
]
229+
},
230+
"val": {
231+
"u32": 1
232+
}
233+
},
179234
{
180235
"key": {
181236
"vec": [
@@ -212,6 +267,18 @@
212267
}
213268
]
214269
}
270+
},
271+
{
272+
"key": {
273+
"vec": [
274+
{
275+
"symbol": "StorageVersion"
276+
}
277+
]
278+
},
279+
"val": {
280+
"u32": 2
281+
}
215282
}
216283
]
217284
}

‎contracts/credit-oracle/test_snapshots/tests/test_apply_weights_after_timelock_succeeds.1.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,18 @@
117117
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
118118
}
119119
},
120+
{
121+
"key": {
122+
"vec": [
123+
{
124+
"symbol": "ComputeCooldownLedgers"
125+
}
126+
]
127+
},
128+
"val": {
129+
"u32": 1
130+
}
131+
},
120132
{
121133
"key": {
122134
"vec": [
@@ -153,6 +165,18 @@
153165
}
154166
]
155167
}
168+
},
169+
{
170+
"key": {
171+
"vec": [
172+
{
173+
"symbol": "StorageVersion"
174+
}
175+
]
176+
},
177+
"val": {
178+
"u32": 2
179+
}
156180
}
157181
]
158182
}

‎contracts/credit-oracle/test_snapshots/tests/test_apply_weights_before_timelock_fails.1.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,18 @@
115115
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
116116
}
117117
},
118+
{
119+
"key": {
120+
"vec": [
121+
{
122+
"symbol": "ComputeCooldownLedgers"
123+
}
124+
]
125+
},
126+
"val": {
127+
"u32": 1
128+
}
129+
},
118130
{
119131
"key": {
120132
"vec": [
@@ -200,6 +212,18 @@
200212
"val": {
201213
"u32": 17280
202214
}
215+
},
216+
{
217+
"key": {
218+
"vec": [
219+
{
220+
"symbol": "StorageVersion"
221+
}
222+
]
223+
},
224+
"val": {
225+
"u32": 2
226+
}
203227
}
204228
]
205229
}

‎contracts/credit-oracle/test_snapshots/tests/test_base_score_is_300.1.json‎

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
},
145145
"ext": "v0"
146146
},
147-
4095
147+
518400
148148
]
149149
],
150150
[
@@ -182,6 +182,18 @@
182182
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
183183
}
184184
},
185+
{
186+
"key": {
187+
"vec": [
188+
{
189+
"symbol": "ComputeCooldownLedgers"
190+
}
191+
]
192+
},
193+
"val": {
194+
"u32": 1
195+
}
196+
},
185197
{
186198
"key": {
187199
"vec": [
@@ -247,6 +259,18 @@
247259
}
248260
]
249261
}
262+
},
263+
{
264+
"key": {
265+
"vec": [
266+
{
267+
"symbol": "StorageVersion"
268+
}
269+
]
270+
},
271+
"val": {
272+
"u32": 2
273+
}
250274
}
251275
]
252276
}
@@ -314,5 +338,33 @@
314338
]
315339
]
316340
},
317-
"events": []
341+
"events": [
342+
{
343+
"event": {
344+
"ext": "v0",
345+
"contract_id": "0000000000000000000000000000000000000000000000000000000000000001",
346+
"type_": "contract",
347+
"body": {
348+
"v0": {
349+
"topics": [
350+
{
351+
"symbol": "Score"
352+
}
353+
],
354+
"data": {
355+
"vec": [
356+
{
357+
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
358+
},
359+
{
360+
"u32": 300
361+
}
362+
]
363+
}
364+
}
365+
}
366+
},
367+
"failed_call": false
368+
}
369+
]
318370
}

0 commit comments

Comments
 (0)