Skip to content

Commit 13b4bb3

Browse files
authored
fix(evm): clean up interface for deploy-time linking (#320)
1 parent ddd60fa commit 13b4bb3

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

era-compiler-solidity/src/build_evm/contract/object.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub struct Object {
2626
pub metadata_bytes: Option<Vec<u8>>,
2727
/// Dependencies.
2828
pub dependencies: era_yul::Dependencies,
29-
/// The unlinked unlinked libraries.
29+
/// The unlinked libraries.
3030
pub unlinked_libraries: BTreeSet<String>,
3131
/// Whether the object is already assembled.
3232
pub is_assembled: bool,

era-compiler-solidity/src/project/contract/mod.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,7 @@ impl Contract {
338338
.map_err(|error| {
339339
anyhow::anyhow!("{runtime_code_segment} code LLVM IR generator: {error}")
340340
})?;
341-
let runtime_build =
342-
runtime_context.build(false, true, unlinked_libraries.clone())?;
341+
let runtime_build = runtime_context.build(false, true)?;
343342
let runtime_object = EVMContractObject::new(
344343
runtime_code_identifier,
345344
self.name.clone(),
@@ -379,7 +378,7 @@ impl Contract {
379378
.map_err(|error| {
380379
anyhow::anyhow!("{deploy_code_segment} code LLVM IR generator: {error}")
381380
})?;
382-
let deploy_build = deploy_context.build(false, true, unlinked_libraries.clone())?;
381+
let deploy_build = deploy_context.build(false, true)?;
383382
let deploy_object = EVMContractObject::new(
384383
deploy_code_identifier,
385384
self.name.clone(),
@@ -436,8 +435,7 @@ impl Contract {
436435
.map_err(|error| {
437436
anyhow::anyhow!("{runtime_code_segment} code LLVM IR generator: {error}")
438437
})?;
439-
let runtime_build =
440-
runtime_context.build(false, true, unlinked_libraries.clone())?;
438+
let runtime_build = runtime_context.build(false, true)?;
441439
let runtime_object = EVMContractObject::new(
442440
runtime_code_identifier,
443441
self.name.clone(),
@@ -473,7 +471,7 @@ impl Contract {
473471
.map_err(|error| {
474472
anyhow::anyhow!("{deploy_code_segment} code LLVM IR generator: {error}")
475473
})?;
476-
let deploy_build = deploy_context.build(false, true, unlinked_libraries.clone())?;
474+
let deploy_build = deploy_context.build(false, true)?;
477475
let deploy_object = EVMContractObject::new(
478476
deploy_code_identifier,
479477
self.name.clone(),
@@ -540,8 +538,7 @@ impl Contract {
540538
optimizer.clone(),
541539
debug_config.clone(),
542540
);
543-
let runtime_build =
544-
runtime_context.build(false, true, unlinked_libraries.clone())?;
541+
let runtime_build = runtime_context.build(false, true)?;
545542
let runtime_object = EVMContractObject::new(
546543
runtime_code_identifier,
547544
self.name.clone(),
@@ -567,7 +564,7 @@ impl Contract {
567564
optimizer,
568565
debug_config,
569566
);
570-
let deploy_build = deploy_context.build(false, true, unlinked_libraries.clone())?;
567+
let deploy_build = deploy_context.build(false, true)?;
571568
let deploy_object = EVMContractObject::new(
572569
deploy_code_identifier,
573570
self.name.clone(),

0 commit comments

Comments
 (0)