update invalid dependency detail tests

FuelLabs · Jun 13, 2023 · 37270bb · 37270bb
1 parent d3119d2
commit 37270bb
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 1 deletion.
diff --git a/forc-pkg/src/manifest.rs b/forc-pkg/src/manifest.rs
@@ -1022,13 +1022,20 @@ mod tests {
             tag: None,
             package: None,
             rev: None,
+            ipfs: None,
         };
 
         let dependency_details_branch = DependencyDetails {
             path: None,
             ..dependency_details_path_branch.clone()
         };
 
+        let dependency_details_ipfs_branch = DependencyDetails {
+            path: None,
+            ipfs: Some("QmVxgEbiDDdHpG9AesCpZAqNvHYp1P3tWLFdrpUBWPMBcc".to_string()),
+            ..dependency_details_path_branch.clone()
+        };
+
         let dependency_details_path_tag = DependencyDetails {
             version: None,
             path: Some("example_path/".to_string()),
@@ -1037,20 +1044,28 @@ mod tests {
             tag: Some("v0.1.0".to_string()),
             package: None,
             rev: None,
+            ipfs: None,
         };
 
         let dependency_details_tag = DependencyDetails {
             path: None,
             ..dependency_details_path_tag.clone()
         };
 
+        let dependency_details_ipfs_tag = DependencyDetails {
+            path: None,
+            ipfs: Some("QmVxgEbiDDdHpG9AesCpZAqNvHYp1P3tWLFdrpUBWPMBcc".to_string()),
+            ..dependency_details_path_branch.clone()
+        };
+
         let dependency_details_path_rev = DependencyDetails {
             version: None,
             path: Some("example_path/".to_string()),
             git: None,
             branch: None,
             tag: None,
             package: None,
+            ipfs: None,
             rev: Some("9f35b8e".to_string()),
         };
 
@@ -1059,6 +1074,12 @@ mod tests {
             ..dependency_details_path_rev.clone()
         };
 
+        let dependency_details_ipfs_rev = DependencyDetails {
+            path: None,
+            ipfs: Some("QmVxgEbiDDdHpG9AesCpZAqNvHYp1P3tWLFdrpUBWPMBcc".to_string()),
+            ..dependency_details_path_branch.clone()
+        };
+
         let expected_mismatch_error = "Details reserved for git sources used without a git field";
         assert_eq!(
             dependency_details_path_branch
@@ -1067,20 +1088,41 @@ mod tests {
                 .map(|e| e.to_string()),
             Some(expected_mismatch_error.to_string())
         );
+        assert_eq!(
+            dependency_details_ipfs_branch
+                .validate()
+                .err()
+                .map(|e| e.to_string()),
+            Some(expected_mismatch_error.to_string())
+        );
         assert_eq!(
             dependency_details_path_tag
                 .validate()
                 .err()
                 .map(|e| e.to_string()),
             Some(expected_mismatch_error.to_string())
         );
+        assert_eq!(
+            dependency_details_ipfs_tag
+                .validate()
+                .err()
+                .map(|e| e.to_string()),
+            Some(expected_mismatch_error.to_string())
+        );
         assert_eq!(
             dependency_details_path_rev
                 .validate()
                 .err()
                 .map(|e| e.to_string()),
             Some(expected_mismatch_error.to_string())
         );
+        assert_eq!(
+            dependency_details_ipfs_rev
+                .validate()
+                .err()
+                .map(|e| e.to_string()),
+            Some(expected_mismatch_error.to_string())
+        );
         assert_eq!(
             dependency_details_branch
                 .validate()
@@ -1114,6 +1156,7 @@ mod tests {
             tag: None,
             package: None,
             rev: None,
+            ipfs: None,
         };
 
         let git_source_string = "https://github.com/FuelLabs/sway".to_string();
@@ -1125,6 +1168,7 @@ mod tests {
             tag: Some("v0.1.0".to_string()),
             package: None,
             rev: None,
+            ipfs: None,
         };
         let dependency_details_git_branch = DependencyDetails {
             version: None,
@@ -1134,6 +1178,7 @@ mod tests {
             tag: None,
             package: None,
             rev: None,
+            ipfs: None,
         };
         let dependency_details_git_rev = DependencyDetails {
             version: None,
@@ -1143,11 +1188,24 @@ mod tests {
             tag: None,
             package: None,
             rev: Some("9f35b8e".to_string()),
+            ipfs: None,
+        };
+
+        let dependency_details_ipfs = DependencyDetails {
+            version: None,
+            path: None,
+            git: None,
+            branch: None, 
+            tag: None,
+            package: None, 
+            rev: None,
+            ipfs: Some("QmVxgEbiDDdHpG9AesCpZAqNvHYp1P3tWLFdrpUBWPMBcc".to_string()),
         };
 
         assert!(dependency_details_path.validate().is_ok());
         assert!(dependency_details_git_tag.validate().is_ok());
         assert!(dependency_details_git_branch.validate().is_ok());
         assert!(dependency_details_git_rev.validate().is_ok());
+        assert!(dependency_details_ipfs.validate().is_ok());
     }
 }
diff --git a/sway-lsp/src/core/session.rs b/sway-lsp/src/core/session.rs
@@ -164,7 +164,9 @@ impl Session {
                     dir: uri.path().into(),
                 })?;
 
-        let ipfs_node = IPFSNode::Local;
+        // TODO: Either we want LSP to deploy a local node in the background or we want this to
+        // point to Fuel operated IPFS node.
+        let ipfs_node = pkg::source::IPFSNode::Local;
 
         let plan = pkg::BuildPlan::from_lock_and_manifests(
             &lock_path,