@@ -992,15 +992,15 @@ pub fn add_serialized_output(result: &mut serde_json::Value, value: Value) {
992
992
993
993
/// Returns (process-exit-code, Option<json-output>)
994
994
pub fn invoke_command ( invoked_by : & str , args : & [ String ] ) -> ( i32 , Option < serde_json:: Value > ) {
995
- invoke_command_with_analysis_db ( invoked_by, args, None )
995
+ invoke_command_with_db ( invoked_by, args, None )
996
996
}
997
997
998
998
/// Returns (process-exit-code, Option<json-output>)
999
999
/// Optionally accepts a shared analysis database for contract dependency resolution
1000
- pub fn invoke_command_with_analysis_db (
1000
+ pub fn invoke_command_with_db (
1001
1001
invoked_by : & str ,
1002
1002
args : & [ String ] ,
1003
- shared_analysis_db : Option < & mut AnalysisDatabase > ,
1003
+ analysis_db : Option < & mut AnalysisDatabase > ,
1004
1004
) -> ( i32 , Option < serde_json:: Value > ) {
1005
1005
if args. is_empty ( ) {
1006
1006
print_usage ( invoked_by) ;
@@ -1659,9 +1659,7 @@ pub fn invoke_command_with_analysis_db(
1659
1659
} else {
1660
1660
None
1661
1661
} ;
1662
- let ( _, _, analysis_result_and_cost) = if let Some ( shared_analysis_db) =
1663
- shared_analysis_db
1664
- {
1662
+ let ( _, _, analysis_result_and_cost) = if let Some ( analysis_db) = analysis_db {
1665
1663
// Use shared analysis database for contract dependency resolution
1666
1664
in_block ( header_db, marf_kv, |header_db, mut marf| {
1667
1665
let analysis_result =
@@ -1682,7 +1680,7 @@ pub fn invoke_command_with_analysis_db(
1682
1680
& contract_content,
1683
1681
None ,
1684
1682
ASTRules :: PrecheckSize ,
1685
- shared_analysis_db ,
1683
+ analysis_db ,
1686
1684
)
1687
1685
} ,
1688
1686
) ;
@@ -2078,7 +2076,7 @@ mod test {
2078
2076
analysis_db. begin ( ) ;
2079
2077
2080
2078
eprintln ! ( "launch tokens" ) ;
2081
- let invoked = invoke_command_with_analysis_db (
2079
+ let invoked = invoke_command_with_db (
2082
2080
"test" ,
2083
2081
& [
2084
2082
"launch" . to_string ( ) ,
@@ -2167,7 +2165,7 @@ mod test {
2167
2165
assert ! ( result[ "assets" ] == json!( null) ) ;
2168
2166
2169
2167
eprintln ! ( "launch names with costs and assets" ) ;
2170
- let invoked = invoke_command_with_analysis_db (
2168
+ let invoked = invoke_command_with_db (
2171
2169
"test" ,
2172
2170
& [
2173
2171
"launch" . to_string ( ) ,
0 commit comments