Move access to externals to Namespace

forc-pkg/src/pkg.rs

@@ -2698,7 +2698,7 @@ pub fn check(
         if let Ok(typed_program) = programs.typed.as_ref() {
             if let TreeType::Library = typed_program.kind.tree_type() {
                 let mut lib_root = typed_program.namespace.root_ref().clone();
-                lib_root.current_package_root_module_mut().set_span(
+                lib_root.root_module_mut().set_span(
                     Span::new(
                         manifest.entry_string()?,
                         0,

sway-core/src/ir_generation.rs

@@ -166,7 +166,7 @@ pub fn compile_program<'eng>(
             engines,
             &mut ctx,
             entry_function,
-            namespace.root_ref(),
+            namespace,
             &logged_types,
             &messages_types,
             &test_fns,
@@ -176,7 +176,7 @@ pub fn compile_program<'eng>(
             engines,
             &mut ctx,
             entry_function,
-            namespace.root_ref(),
+            namespace,
             &logged_types,
             &messages_types,
             &test_fns,
@@ -189,7 +189,7 @@ pub fn compile_program<'eng>(
             &mut ctx,
             entry_function.as_ref(),
             abi_entries,
-            namespace.root_ref(),
+            namespace,
             declarations,
             &logged_types,
             &messages_types,
@@ -200,7 +200,7 @@ pub fn compile_program<'eng>(
         ty::TyProgramKind::Library { .. } => compile::compile_library(
             engines,
             &mut ctx,
-            namespace.root_ref(),
+            namespace,
             &logged_types,
             &messages_types,
             &test_fns,

sway-core/src/ir_generation/compile.rs

@@ -27,7 +27,7 @@ pub(super) fn compile_script(
     engines: &Engines,
     context: &mut Context,
     entry_function: &DeclId<ty::TyFunctionDecl>,
-    namespace: &namespace::Root,
+    namespace: &namespace::Namespace,
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
     test_fns: &[(Arc<ty::TyFunctionDecl>, DeclRefFunction)],
@@ -80,7 +80,7 @@ pub(super) fn compile_predicate(
     engines: &Engines,
     context: &mut Context,
     entry_function: &DeclId<ty::TyFunctionDecl>,
-    namespace: &namespace::Root,
+    namespace: &namespace::Namespace,
     logged_types: &HashMap<TypeId, LogId>,
     messages_types: &HashMap<TypeId, MessageId>,
     test_fns: &[(Arc<ty::TyFunctionDecl>, DeclRefFunction)],
@@ -133,7 +133,7 @@ pub(super) fn compile_contract(
     context: &mut Context,
     entry_function: Option<&DeclId<ty::TyFunctionDecl>>,
     abi_entries: &[DeclId<ty::TyFunctionDecl>],
-    namespace: &namespace::Root,
+    namespace: &namespace::Namespace,
     declarations: &[ty::TyDecl],
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
@@ -224,7 +224,7 @@ pub(super) fn compile_contract(
 pub(super) fn compile_library(
     engines: &Engines,
     context: &mut Context,
-    namespace: &namespace::Root,
+    namespace: &namespace::Namespace,
     logged_types_map: &HashMap<TypeId, LogId>,
     messages_types_map: &HashMap<TypeId, MessageId>,
     test_fns: &[(Arc<ty::TyFunctionDecl>, DeclRefFunction)],
@@ -255,25 +255,29 @@ pub(crate) fn compile_constants_for_package(
     engines: &Engines,
     context: &mut Context,
     module: Module,
-    namespace: &namespace::Root,
+    namespace: &namespace::Namespace,
 ) -> Result<Module, Vec<CompileError>> {
-    let mut md_mgr = MetadataManager::default();
+    // Traverses the tree of externals and collects all constants
+    fn traverse(
+        engines: &Engines,
+        context: &mut Context,
+        module: Module,
+        current: &namespace::Root,
+    ) -> Result<Module, Vec<CompileError>> {
+        let mut md_mgr = MetadataManager::default();
+
+        // Collect constant for all dependencies
+        for ext_package in current.external_packages.values() {
+            traverse(engines, context, module, ext_package)?;
+        }
 
-    // Collect constant for all dependencies
-    for ext_package in namespace.external_packages().values() {
-        compile_constants_for_package(engines, context, module, ext_package)?;
-    }
+        compile_constants(engines, context, &mut md_mgr, module, current.root_module())
+            .map_err(|err| vec![err])?;
 
-    compile_constants(
-        engines,
-        context,
-        &mut md_mgr,
-        module,
-        namespace.current_package_root_module(),
-    )
-    .map_err(|err| vec![err])?;
+        Ok(module)
+    }
 
-    Ok(module)
+    traverse(engines, context, module, namespace.root_ref())
 }
 
 fn compile_constants(

sway-core/src/language/call_path.rs

@@ -417,7 +417,7 @@ impl CallPath {
             CallPathDisplayType::Regular => {}
             CallPathDisplayType::StripPackagePrefix => {
                 if let Some(first) = self.prefixes.first() {
-                    if namespace.root_ref().current_package_root_module().name() == first {
+                    if namespace.current_package_name() == first {
                         display_path = display_path.lshift();
                     }
                 }

sway-core/src/lib.rs

@@ -702,7 +702,7 @@ pub fn parsed_to_ast(
         engines,
         &mut ctx,
         module,
-        typed_program.namespace.root_ref(),
+        &typed_program.namespace,
     ) {
         errs.into_iter().for_each(|err| {
             handler.emit_err(err.clone());