fix: tx_builder warning on misconfiguration

projectNEWM · Oct 17, 2024 · 4a973bc · 4a973bc
1 parent 20c809d
commit 4a973bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 
 allprojects {
     group = "io.newm.server"
-    version = "0.4.2-SNAPSHOT"
+    version = "0.4.3-SNAPSHOT"
 }
 
 subprojects {

diff --git a/newm-tx-builder/src/main/kotlin/io/newm/txbuilder/TransactionBuilder.kt b/newm-tx-builder/src/main/kotlin/io/newm/txbuilder/TransactionBuilder.kt
@@ -41,6 +41,7 @@ import kotlin.math.ceil
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
+import org.slf4j.LoggerFactory
 
 /**
  * A builder for cardano conway transactions.
@@ -53,7 +54,7 @@ class TransactionBuilder(
     private val calculateReferenceScriptBytes: (suspend (Set<Utxo>) -> Long)? = null,
     private val calculateReferenceScriptsVersions: (suspend (Set<Utxo>) -> Set<Int>)? = null,
 ) {
-    // private val log by lazy { LoggerFactory.getLogger("TransactionBuilder") }
+    private val log by lazy { LoggerFactory.getLogger("TransactionBuilder") }
     private val secureRandom by lazy { SecureRandom() }
 
     private val txFeeFixed by lazy {
@@ -460,11 +461,13 @@ class TransactionBuilder(
                 }
 
             // Calculate referenceInputs fee
-            val referenceScriptBytes = if (!referenceInputs.isNullOrEmpty() && calculateReferenceScriptBytes != null) {
-                calculateReferenceScriptBytes.invoke(referenceInputs!!)
-            } else {
-                null
-            }
+            val referenceScriptBytes: Long? =
+                referenceInputs?.takeIf { it.isNotEmpty() }?.let { refInputs ->
+                    calculateReferenceScriptBytes?.invoke(refInputs) ?: run {
+                        log.warn("calculateReferenceScriptBytes is not defined, but referenceInputs exist!")
+                        null
+                    }
+                }
 
             updateFeesAndCollateral(
                 cborByteSize = dummyTxCbor.size,