Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Update SharingStarted usages from Lazily to WhileSubscribed()… #66

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Revert "Update SharingStarted usages from Lazily to WhileSubscribed()… #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions ...src/main/java/exchange/dydx/trading/feature/market/marketinfo/streams/MarketInfoStream.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@ import exchange.dydx.abacus.output.SubaccountPosition
import exchange.dydx.abacus.protocols.LocalizerProtocol
import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
import exchange.dydx.dydxstatemanager.clientState.favorite.DydxFavoriteStoreProtocol
import exchange.dydx.trading.common.di.CoroutineScopes
import exchange.dydx.trading.common.formatter.DydxFormatter
import exchange.dydx.trading.feature.shared.viewstate.SharedMarketViewState
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.shareIn
import kotlinx.coroutines.plus
import javax.inject.Inject

interface MarketInfoStreaming {
Expand All @@ -38,10 +40,8 @@ class MarketInfoStream @Inject constructor(
val formatter: DydxFormatter,
val localizer: LocalizerProtocol,
val favoriteStore: DydxFavoriteStoreProtocol,
@CoroutineScopes.App private val streamScope: CoroutineScope,
) : MutableMarketInfoStreaming {

private val streamScope = MainScope()

override fun update(marketId: String?) {
abacusStateManager.setMarket(marketId)
abacusStateManager.startTrade()
Expand All @@ -54,7 +54,8 @@ class MarketInfoStream @Inject constructor(
abacusStateManager.state.market(marketId)
}
.distinctUntilChanged()
.shareIn(streamScope, SharingStarted.WhileSubscribed(), 1)
.flowOn(Dispatchers.Default)
.shareIn(streamScope, SharingStarted.Lazily, 1)

override val marketAndAsset: Flow<MarketAndAsset?> =
abacusStateManager.marketId
Expand All @@ -77,7 +78,8 @@ class MarketInfoStream @Inject constructor(
}
}
.distinctUntilChanged()
.shareIn(streamScope, SharingStarted.WhileSubscribed(), 1)
.flowOn(Dispatchers.Default)
.shareIn(streamScope, SharingStarted.Lazily, 1)

override val selectedSubaccountPosition: Flow<SubaccountPosition?> =
combine(
Expand All @@ -93,7 +95,8 @@ class MarketInfoStream @Inject constructor(
}
}
.distinctUntilChanged()
.shareIn(streamScope, SharingStarted.WhileSubscribed(), 1)
.flowOn(Dispatchers.Default)
.shareIn(streamScope, SharingStarted.Lazily, 1)

override val sharedMarketViewState: Flow<SharedMarketViewState?> =
combine(
Expand All @@ -113,7 +116,8 @@ class MarketInfoStream @Inject constructor(
}
}
.distinctUntilChanged()
.shareIn(streamScope, SharingStarted.WhileSubscribed(), 1)
.flowOn(Dispatchers.Default)
.shareIn(streamScope, SharingStarted.Lazily, 1)
}

data class MarketAndAsset(
Expand Down
Loading
Loading