Skip to content

Commit f8cb834

Browse files
committed
refactor: move node start callback last
1 parent 3f9ea1f commit f8cb834

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ class LightningRepo @Inject constructor(
166166
walletIndex: Int = 0,
167167
timeout: Duration? = null,
168168
shouldRetry: Boolean = true,
169-
eventHandler: NodeEventHandler? = null,
170169
customServerUrl: String? = null,
171170
customRgsServerUrl: String? = null,
171+
eventHandler: NodeEventHandler? = null,
172172
): Result<Unit> = withContext(bgDispatcher) {
173173
if (_isRecoveryMode.value) {
174174
return@withContext Result.failure(
@@ -239,9 +239,9 @@ class LightningRepo @Inject constructor(
239239
walletIndex = walletIndex,
240240
timeout = timeout,
241241
shouldRetry = false,
242-
eventHandler = eventHandler,
243242
customServerUrl = customServerUrl,
244243
customRgsServerUrl = customRgsServerUrl,
244+
eventHandler = eventHandler,
245245
)
246246
} else {
247247
Logger.error("Node start error", e, context = TAG)
@@ -337,9 +337,9 @@ class LightningRepo @Inject constructor(
337337
Logger.debug("Starting node with new electrum server: '$newServerUrl'")
338338

339339
start(
340-
eventHandler = cachedEventHandler,
341-
customServerUrl = newServerUrl,
342340
shouldRetry = false,
341+
customServerUrl = newServerUrl,
342+
eventHandler = cachedEventHandler,
343343
).onFailure { startError ->
344344
Logger.warn("Failed ldk-node config change, attempting recovery…")
345345
restartWithPreviousConfig()
@@ -364,9 +364,9 @@ class LightningRepo @Inject constructor(
364364
Logger.debug("Starting node with new RGS server: '$newRgsUrl'")
365365

366366
start(
367-
eventHandler = cachedEventHandler,
368367
shouldRetry = false,
369368
customRgsServerUrl = newRgsUrl,
369+
eventHandler = cachedEventHandler,
370370
).onFailure { startError ->
371371
Logger.warn("Failed ldk-node config change, attempting recovery…")
372372
restartWithPreviousConfig()
@@ -390,8 +390,8 @@ class LightningRepo @Inject constructor(
390390
Logger.debug("Starting node with previous config for recovery")
391391

392392
start(
393-
eventHandler = cachedEventHandler,
394393
shouldRetry = false,
394+
eventHandler = cachedEventHandler,
395395
).onSuccess {
396396
Logger.debug("Successfully started node with previous config")
397397
}.onFailure { e ->

app/src/main/java/to/bitkit/services/CoreService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class CoreService @Inject constructor(
164164
// endregion
165165

166166
// region Activity
167-
private const val CHUNCK_SIZE = 50
167+
private const val CHUNK_SIZE = 50
168168

169169
class ActivityService(
170170
private val coreService: CoreService,
@@ -284,7 +284,7 @@ class ActivityService(
284284
ServiceQueue.CORE.background {
285285
val allResults = mutableListOf<Result<String>>()
286286

287-
payments.chunked(CHUNCK_SIZE).forEach { chunk ->
287+
payments.chunked(CHUNK_SIZE).forEach { chunk ->
288288
val results = chunk.map { payment ->
289289
async {
290290
runCatching {

0 commit comments

Comments
 (0)