From adb54e3b87a19de6f756c773da6634988eb6963b Mon Sep 17 00:00:00 2001
From: Steve Myers <steve@notmandatory.org>
Date: Sun, 20 Jun 2021 23:39:42 -0700
Subject: [PATCH] Add slf4j logging for kotlin jvm and android

---
 bdk-kotlin/android/build.gradle                    | 13 +++----------
 .../android/src/androidTest/assets/logback.xml     | 14 ++++++++++++++
 bdk-kotlin/jvm/build.gradle                        |  3 +++
 bdk-kotlin/test-fixtures/build.gradle              |  1 +
 .../src/main/java/org/bitcoindevkit/bdk/LibTest.kt | 14 +++++++++-----
 5 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 bdk-kotlin/android/src/androidTest/assets/logback.xml

diff --git a/bdk-kotlin/android/build.gradle b/bdk-kotlin/android/build.gradle
index 2236add..8cfcfc3 100644
--- a/bdk-kotlin/android/build.gradle
+++ b/bdk-kotlin/android/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-//apply plugin: 'kotlin-android-extensions'
 apply plugin: 'maven-publish'
 
 android {
@@ -24,15 +23,7 @@ android {
     }
 }
 
-//task buildRust(type: Exec) {
-//    workingDir '../'
-//    commandLine './build.sh'
-//}
-
 afterEvaluate {
-//    android.libraryVariants.all { variant ->
-//        variant.javaCompileProvider.get().dependsOn(buildRust)
-//    }
 
     publishing {
         publications {
@@ -68,7 +59,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.core:core-ktx:1.5.0'
-    
+    api "org.slf4j:slf4j-api:1.7.30"
+
+    androidTestImplementation 'com.github.tony19:logback-android:2.0.0'
     androidTestImplementation (project(':test-fixtures')) {
         exclude group: 'net.java.dev.jna', module: 'jna'
     }
diff --git a/bdk-kotlin/android/src/androidTest/assets/logback.xml b/bdk-kotlin/android/src/androidTest/assets/logback.xml
new file mode 100644
index 0000000..8f7c81b
--- /dev/null
+++ b/bdk-kotlin/android/src/androidTest/assets/logback.xml
@@ -0,0 +1,14 @@
+<configuration>
+    <appender name="logcat" class="ch.qos.logback.classic.android.LogcatAppender">
+        <tagEncoder>
+            <pattern>%logger{12}</pattern>
+        </tagEncoder>
+        <encoder>
+            <pattern>[%-20thread] %msg</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <appender-ref ref="logcat" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/bdk-kotlin/jvm/build.gradle b/bdk-kotlin/jvm/build.gradle
index 3b1618a..d22bf52 100644
--- a/bdk-kotlin/jvm/build.gradle
+++ b/bdk-kotlin/jvm/build.gradle
@@ -20,6 +20,9 @@ dependencies {
     implementation platform('org.jetbrains.kotlin:kotlin-bom')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "net.java.dev.jna:jna:5.8.0"
+    api "org.slf4j:slf4j-api:1.7.30"
+    testImplementation "ch.qos.logback:logback-classic:1.2.3"
+    testImplementation "ch.qos.logback:logback-core:1.2.3"
     testImplementation 'org.jetbrains.kotlin:kotlin-test-junit'
     testImplementation (project(':test-fixtures'))
 }
diff --git a/bdk-kotlin/test-fixtures/build.gradle b/bdk-kotlin/test-fixtures/build.gradle
index f8fdc15..46b7292 100644
--- a/bdk-kotlin/test-fixtures/build.gradle
+++ b/bdk-kotlin/test-fixtures/build.gradle
@@ -9,6 +9,7 @@ dependencies {
     implementation "net.java.dev.jna:jna:5.8.0"
     implementation (project(':jvm'))
     implementation 'org.jetbrains.kotlin:kotlin-test-junit'
+    api "org.slf4j:slf4j-api:1.7.30"
 }
 
 java {
diff --git a/bdk-kotlin/test-fixtures/src/main/java/org/bitcoindevkit/bdk/LibTest.kt b/bdk-kotlin/test-fixtures/src/main/java/org/bitcoindevkit/bdk/LibTest.kt
index 1fd545a..9ef5b4e 100644
--- a/bdk-kotlin/test-fixtures/src/main/java/org/bitcoindevkit/bdk/LibTest.kt
+++ b/bdk-kotlin/test-fixtures/src/main/java/org/bitcoindevkit/bdk/LibTest.kt
@@ -3,6 +3,8 @@ package org.bitcoindevkit.bdk
 import com.sun.jna.Native
 import org.junit.*
 import org.junit.Assert.assertEquals
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
@@ -13,6 +15,8 @@ import kotlin.test.assertNull
 abstract class LibTest {
 
     companion object {
+        private val log: Logger = LoggerFactory.getLogger(LibTest::class.java)
+        
         private val bdkFfi: Lib = Native.load("bdk_ffi", Lib::class.java)
         private lateinit var wallet_result: Lib.WalletResult_t
 
@@ -26,26 +30,26 @@ abstract class LibTest {
                 "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/1/*)"
 
             wallet_result = bdkFfi.new_wallet_result(name, desc, change)
-            //println("wallet created")
+            log.debug("wallet created")
         }
 
         @AfterClass
         @JvmStatic
         fun free_wallet() {
             bdkFfi.free_wallet_result(wallet_result)
-            //println("wallet freed")
+            log.debug("wallet freed")
         }
     }
 
     @Test
     fun wallet_sync_error() {
         val bad_wallet_result = bdkFfi.new_wallet_result("test", "bad", null)
-        //println("wallet result created")
+        log.debug("wallet result created")
         val sync_result = bdkFfi.sync_wallet(bad_wallet_result)
         val sync_err_pointer = bdkFfi.get_void_err(sync_result)
         assertNotNull(sync_err_pointer)
         val sync_err = sync_err_pointer!!.getString(0)
-        //println("wallet sync error $sync_err")
+        log.debug("wallet sync error $sync_err")
     }
 
     @Test
@@ -64,7 +68,7 @@ abstract class LibTest {
         
         bdkFfi.free_string_result(address_result)
         bdkFfi.free_string(address_pointer)
-        //println("address created from kotlin: $address")
+        log.debug("address created from kotlin: $address")
         assertEquals(address, "tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e")
     }
 }