Skip to content

Commit 279c2df

Browse files
committed
Fix after merge: rename unparse -> name
1 parent 5915130 commit 279c2df

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

  • crates/solidity/outputs/cargo

crates/solidity/outputs/cargo/crate/src/backend/ir/ast/node_extensions/contracts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ impl ContractDefinitionStruct {
139139
(None, None) => Ordering::Equal,
140140
(None, Some(_)) => Ordering::Less,
141141
(Some(_), None) => Ordering::Greater,
142-
(Some(a), Some(b)) => a.unparse().cmp(&b.unparse()),
142+
(Some(a), Some(b)) => a.name().cmp(&b.name()),
143143
});
144144
functions
145145
}

crates/solidity/outputs/cargo/tests/src/backend/semantic/mod.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ fn test_get_linearised_state_variables() -> Result<()> {
204204
let state_variables = counter.compute_linearised_state_variables();
205205
assert_eq!(state_variables.len(), 4);
206206

207-
assert_eq!(state_variables[0].name().unparse(), "_owner");
208-
assert_eq!(state_variables[1].name().unparse(), "_state");
209-
assert_eq!(state_variables[2].name().unparse(), "count");
210-
assert_eq!(state_variables[3].name().unparse(), "_clickers");
207+
assert_eq!(state_variables[0].name().name(), "_owner");
208+
assert_eq!(state_variables[1].name().name(), "_state");
209+
assert_eq!(state_variables[2].name().name(), "count");
210+
assert_eq!(state_variables[3].name().name(), "_clickers");
211211

212212
Ok(())
213213
}
@@ -226,19 +226,19 @@ fn test_get_linearised_functions() -> Result<()> {
226226

227227
assert!(functions[0]
228228
.name()
229-
.is_some_and(|name| name.unparse() == "click"));
229+
.is_some_and(|name| name.name() == "click"));
230230
assert!(functions[1]
231231
.name()
232-
.is_some_and(|name| name.unparse() == "disable"));
232+
.is_some_and(|name| name.name() == "disable"));
233233
assert!(functions[2]
234234
.name()
235-
.is_some_and(|name| name.unparse() == "enable"));
235+
.is_some_and(|name| name.name() == "enable"));
236236
assert!(functions[3]
237237
.name()
238-
.is_some_and(|name| name.unparse() == "increment"));
238+
.is_some_and(|name| name.name() == "increment"));
239239
assert!(functions[4]
240240
.name()
241-
.is_some_and(|name| name.unparse() == "isEnabled"));
241+
.is_some_and(|name| name.name() == "isEnabled"));
242242

243243
Ok(())
244244
}
@@ -273,13 +273,13 @@ fn test_get_linearised_function_with_overrides() -> Result<()> {
273273
assert_eq!(functions.len(), 3);
274274
assert!(functions[0]
275275
.name()
276-
.is_some_and(|name| name.unparse() == "in_base"));
276+
.is_some_and(|name| name.name() == "in_base"));
277277
assert!(functions[1]
278278
.name()
279-
.is_some_and(|name| name.unparse() == "in_middle"));
279+
.is_some_and(|name| name.name() == "in_middle"));
280280
assert!(functions[2]
281281
.name()
282-
.is_some_and(|name| name.unparse() == "override_me"));
282+
.is_some_and(|name| name.name() == "override_me"));
283283

284284
Ok(())
285285
}

0 commit comments

Comments
 (0)