Add go-fula Blockstore support

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-  "rust-analyzer.cargo.target": "aarch64-linux-android",
+  // "rust-analyzer.cargo.target": "aarch64-linux-android",
 }

Readme.md

@@ -5,7 +5,12 @@ A wnfslib wrapper for Android.
 ## Prerequisites
 
 - Kotlin toolchain
-- Android SDK + NDK r24 (latest)
+- Android SDK + NDK (latest)
+- python3 and Python command available
+- Cargo and CMake
+- java
+- gradle
+- rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
 
 ## Debug
 
@@ -41,4 +46,4 @@ Ensure you have committed your changes.
 ./gradlew release
 ```
 
-Then simply push to the repo.
+Then simply push to the repo.

appmock/src/androidTest/java/com/functionland/app/WNFSTest.kt

@@ -13,6 +13,7 @@ import land.fx.wnfslib.createRootDir
 import land.fx.wnfslib.writeFile
 import land.fx.wnfslib.readFile
 import land.fx.wnfslib.ls
+import land.fx.wnfslib.mkdir
 import junit.framework.Assert.assertNotNull
 
 @RunWith(AndroidJUnit4::class)
@@ -28,14 +29,18 @@ class WNFSTest {
         var cid = createPrivateForest(path.toString())
         println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
         println(cid)
-        val config = createRootDir(path.toString(), cid)
+        var config = createRootDir(path.toString(), cid)
         assertNotNull("cid should not be null", cid)
         assertNotNull("private_ref should not be null", config.private_ref)
-        cid = writeFile(path.toString(), config.cid, config.private_ref, "root/test.txt", "Hello, World!".toByteArray())
+        config = writeFile(path.toString(), config.cid, config.private_ref, "root/test.txt", "Hello, World!".toByteArray())
         assertNotNull("cid should not be null", cid)
-        val fileNames = ls(path.toString(), cid, config.private_ref, "root")
-        assertEquals(fileNames, "test.txt")
-        val content = readFile(path.toString(), cid, config.private_ref, "root/test.txt")
+        config = mkdir(path.toString(), config.cid, config.private_ref, "root/test1")
+        val fileNames = ls(path.toString(), config.cid, config.private_ref, "root")
+        assertEquals(fileNames, "test.txt\ntest1")
+        val content = readFile(path.toString(), config.cid, config.private_ref, "root/test.txt")
         assert(content contentEquals "Hello, World!".toByteArray())
+        config = rm(path.toString(), config.cid, config.private_ref, "root/test.txt")
+        content = readFile(path.toString(), config.cid, config.private_ref, "root/test.txt")
+        assertNull(content)
     }
 }

build.gradle

@@ -29,6 +29,7 @@ allprojects {
         jcenter()
         maven { url "https://plugins.gradle.org/m2/" }
         gradlePluginPortal()
+        maven { url "https://jitpack.io" }
     }
 }
 

lib/build.gradle

@@ -49,6 +49,7 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.github.functionland:fula-build-aar:v0.6.6' // From jitpack.io
 }
 
 tasks.whenTaskAdded { task ->

lib/src/main/java/land/fx/wnfslib/Lib.kt

@@ -1,5 +1,7 @@
 package land.fx.wnfslib;
 
+import fulamobile.Client;
+
 data class Config(
    val cid: String,
    val private_ref: String){
@@ -9,34 +11,47 @@ data class Config(
   }
 }
 
-private external fun createPrivateForestNative(dbPath: String): String
+private external fun createPrivateForestNative(fulaClient: Client): String
+
+private external fun createRootDirNative(fulaClient: Client, cid: String): Config
+
+private external fun writeFileNative(fulaClient: Client, cid: String, privateRef: String, path: String, content: ByteArray): Config
+
+private external fun lsNative(fulaClient: Client, cid: String, privateRef: String, path: String): String
 
-private external fun createRootDirNative(dbPath: String, cid: String): Config
+private external fun mkdirNative(fulaClient: Client, cid: String, privateRef: String, path: String): Config
 
-private external fun writeFileNative(dbPath: String, cid: String, privateRef: String, path: String, content: ByteArray): String
+private external fun rmNative(fulaClient: Client, cid: String, privateRef: String, path: String): Config
 
-private external fun lsNative(dbPath: String, cid: String, privateRef: String, path: String): String
+private external fun readFileNative(fulaClient: Client, cid: String, privateRef: String, path: String): ByteArray?
 
-private external fun readFileNative(dbPath: String, cid: String, privateRef: String, path: String): ByteArray
+fun createPrivateForest(fulaClient: Client): String {
+   return createPrivateForestNative(fulaClient)
+}
+
+fun createRootDir(fulaClient: Client, cid: String): Config {
+   return createRootDirNative(fulaClient, cid)
+}
 
-fun createPrivateForest(dbPath: String): String {
-   return createPrivateForestNative(dbPath)
+fun writeFile(fulaClient: Client, cid: String, privateRef: String, path: String, content: ByteArray): Config {
+   return writeFileNative(fulaClient, cid, privateRef, path, content)
 }
 
-fun createRootDir(dbPath: String, cid: String): Config {
-   return createRootDirNative(dbPath, cid)
+fun ls(fulaClient: Client, cid: String, privateRef: String, path: String): String {
+   return lsNative(fulaClient, cid, privateRef, path)
 }
 
-fun writeFile(dbPath: String, cid: String, privateRef: String, path: String, content: ByteArray): String {
-   return writeFileNative(dbPath, cid, privateRef, path, content)
+fun mkdir(fulaClient: Client, cid: String, privateRef: String, path: String): Config {
+   return mkdirNative(fulaClient, cid, privateRef, path)
 }
 
-fun ls(dbPath: String, cid: String, privateRef: String, path: String): String {
-   return lsNative(dbPath, cid, privateRef, path)
+fun rm(fulaClient: Client, cid: String, privateRef: String, path: String): Config {
+   return rmNative(fulaClient, cid, privateRef, path)
 }
 
-fun readFile(dbPath: String, cid: String, privateRef: String, path: String): ByteArray {
-   return readFileNative(dbPath, cid, privateRef, path)
+fun readFile(fulaClient: Client, cid: String, privateRef: String, path: String): ByteArray? {
+   return readFileNative(fulaClient, cid, privateRef, path)
 }
+
 // Initialize Rust Library Logging
 external fun initRustLogger()