Add ic-repl and test fatfs example (#12)

* Add ic-repl and test fatfs example

* Restore crate-type for Wasm build products
* Revert back to using custom canister type
* Remove src directory from examples
* Provide interface in .did file
* Change fatfs ls return type
* Update how Rust packages are built

* Update DFINITY SDK for patchelfing fix

* Update DFINITY SDK for nativeBuildInputs fix

* Attempt to fix build inputs

* Try patchelfing binaries on linux

* Try using --emulator

* Don't use emulator, try different patchelfing

* Update dfinity-sdk for unconditional patchelfing

* Update dfinity-sdk for icx-proxy patchelfing

* Try 0.9.2

* Update dfinity-sdk to remove patchelfing

* Update dfinity-sdk to restore patchelfing

* Revert back to 0.8.4

* Update dfinity-sdk to remove patchelfing

* Remove Linux from the build matrix for now

* Revert "Remove Linux from the build matrix for now"

This reverts commit 4fe71be.

* Only run example tests on darwin for now

Author: paulyoung

Cargo.lock

@@ -2,5 +2,5 @@
 members = [
     "crates/icfs",
     "crates/icfs-fatfs",
-    "examples/src/fatfs",
+    "examples/fatfs",
 ]

Cargo.toml

@@ -8,6 +8,7 @@ authors = ["Paul Young <84700+paulyoung@users.noreply.github.com>"]
 
 [lib]
 path = "lib.rs"
+crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fatfs = { git = "https://github.com/rafalh/rust-fatfs", rev = "87fc1ed5074a32b4e0344fcdde77359ef9e75432" }

crates/icfs-fatfs/Cargo.toml

@@ -8,6 +8,7 @@ authors = ["Paul Young <84700+paulyoung@users.noreply.github.com>"]
 
 [lib]
 path = "lib.rs"
+crate-type = ["cdylib", "lib"]
 
 [dependencies]
 ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "a253119adb08929b6304d007ee0a6a37960656ed" }

crates/icfs/Cargo.toml

@@ -3,9 +3,10 @@
   "dfx": "0.8.4",
   "canisters": {
     "fatfs": {
-      "type": "rust",
-      "package": "fatfs_example",
-      "candid": "examples/src/fatfs/fatfs.did"
+      "type": "custom",
+      "build": "nix build '.#fatfs-example'",
+      "candid": "examples/fatfs/fatfs.did",
+      "wasm": "result/lib/fatfs_example.wasm"
     }
   },
   "networks": {

dfx.json

@@ -1,5 +1,5 @@
 [package]
-name = "fatfs_example"
+name = "fatfs-example"
 version = "0.1.0"
 edition = "2018"
 authors = ["Paul Young <84700+paulyoung@users.noreply.github.com>"]
@@ -8,12 +8,12 @@ authors = ["Paul Young <84700+paulyoung@users.noreply.github.com>"]
 
 [lib]
 path = "lib.rs"
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fatfs = { git = "https://github.com/rafalh/rust-fatfs", rev = "87fc1ed5074a32b4e0344fcdde77359ef9e75432" }
 fscommon = "0.1"
 ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "a253119adb08929b6304d007ee0a6a37960656ed" }
 ic-cdk-macros = "0.3"
-icfs = { path = "../../../crates/icfs" }
-icfs-fatfs = { path = "../../../crates/icfs-fatfs" }
+icfs = { path = "../../crates/icfs" }
+icfs-fatfs = { path = "../../crates/icfs-fatfs" }

examples/src/fatfs/Cargo.toml examples/fatfs/Cargo.tomlexamples/src/fatfs/Cargo.toml renamed to examples/fatfs/Cargo.toml

@@ -0,0 +1,5 @@
+service : {
+  ls : () -> (vec text) query;
+  write_file : (filename : text, contents : text) -> ();
+  read_file : (filename : text) -> (text) query;
+}

examples/fatfs/fatfs.did

@@ -57,11 +57,11 @@ thread_local! {
 }
 
 #[query]
-fn ls() -> String {
+fn ls() -> Vec<String> {
     _ls().unwrap()
 }
 
-fn _ls() -> std::io::Result<String> {
+fn _ls() -> std::io::Result<Vec<String>> {
     FS.with(|fs| {
         let fs = fs.borrow();
         let root_dir = fs.root_dir();
@@ -73,7 +73,7 @@ fn _ls() -> std::io::Result<String> {
                     .map_err(|error| std::io::Error::new(std::io::ErrorKind::Other, error))
             })
             .collect();
-        entries.map(|entries| entries.join("\n"))
+        entries
     })
 }
 

examples/src/fatfs/lib.rs examples/fatfs/lib.rsexamples/src/fatfs/lib.rs renamed to examples/fatfs/lib.rs

@@ -0,0 +1,29 @@
+import fatfs = "rrkah-fqaaa-aaaaa-aaaaq-cai" as "fatfs.did";
+// import fatfs = "ai7t5-aibaq-aaaaa-aaaaa-c" as "fatfs.did";
+
+let result = call fatfs.ls();
+assert result == vec {};
+
+let result = call fatfs.write_file("hello.txt", "Hello, World!");
+assert result == null;
+
+let result = call fatfs.ls();
+assert result == vec { "hello.txt"; };
+
+let result = call fatfs.read_file("hello.txt");
+assert result == "Hello, World!";
+
+let result = call fatfs.write_file("hello.txt", "Hello!");
+assert result == null;
+
+let result = call fatfs.read_file("hello.txt");
+assert result == "Hello!";
+
+let result = call fatfs.write_file("goodbye.txt", "Goodbye!");
+assert result == null;
+
+let result = call fatfs.ls();
+assert result == vec { "hello.txt"; "goodbye.txt"; };
+
+let result = call fatfs.read_file("goodbye.txt");
+assert result == "Goodbye!";