refactor: extract runtime state backends

This commit is contained in:
fawney19
2026-05-08 00:18:12 +08:00
parent 6f620d92be
commit 6247ac3edc
111 changed files with 4358 additions and 3203 deletions

View File

@@ -1,5 +1,4 @@
use aether_data::driver::postgres::PostgresPoolConfig;
use aether_data::driver::redis::RedisClientConfig;
use aether_data::{DataLayerConfig, SqlDatabaseConfig};
use std::fmt;
@@ -7,7 +6,6 @@ use std::fmt;
pub struct GatewayDataConfig {
database: Option<SqlDatabaseConfig>,
postgres: Option<PostgresPoolConfig>,
redis: Option<RedisClientConfig>,
encryption_key: Option<String>,
}
@@ -16,7 +14,6 @@ impl fmt::Debug for GatewayDataConfig {
f.debug_struct("GatewayDataConfig")
.field("database", &self.database)
.field("postgres", &self.postgres)
.field("redis", &self.redis)
.field("has_encryption_key", &self.encryption_key.is_some())
.finish()
}
@@ -31,7 +28,6 @@ impl GatewayDataConfig {
Self {
database: Some(SqlDatabaseConfig::from_postgres_config(postgres.clone())),
postgres: Some(postgres),
redis: None,
encryption_key: None,
}
}
@@ -41,7 +37,6 @@ impl GatewayDataConfig {
Self {
database: Some(database),
postgres,
redis: None,
encryption_key: None,
}
}
@@ -61,26 +56,6 @@ impl GatewayDataConfig {
self.database.as_ref()
}
pub fn redis(&self) -> Option<&RedisClientConfig> {
self.redis.as_ref()
}
pub fn with_redis_config(mut self, redis: RedisClientConfig) -> Self {
self.redis = Some(redis);
self
}
pub fn with_redis_url(
self,
url: impl Into<String>,
key_prefix: Option<impl Into<String>>,
) -> Self {
self.with_redis_config(RedisClientConfig {
url: url.into(),
key_prefix: key_prefix.map(Into::into),
})
}
pub fn with_encryption_key(mut self, encryption_key: impl Into<String>) -> Self {
let encryption_key = encryption_key.into();
let encryption_key = encryption_key.trim();
@@ -96,15 +71,22 @@ impl GatewayDataConfig {
self.encryption_key.as_deref()
}
pub fn with_redis_url(
self,
_url: impl Into<String>,
_key_prefix: Option<impl Into<String>>,
) -> Self {
self
}
pub fn is_enabled(&self) -> bool {
self.database.is_some() || self.postgres.is_some() || self.redis.is_some()
self.database.is_some() || self.postgres.is_some()
}
pub fn to_data_layer_config(&self) -> DataLayerConfig {
DataLayerConfig {
database: self.database.clone(),
postgres: self.postgres.clone(),
redis: self.redis.clone(),
}
}
}

View File

@@ -195,27 +195,6 @@ impl GatewayDataState {
}
}
pub(crate) async fn cache_set_string_with_ttl(
&self,
key: &str,
value: &str,
ttl_seconds: u64,
) -> Result<(), DataLayerError> {
let Some(runner) = self.kv_runner() else {
return Ok(());
};
runner.setex(key, value, Some(ttl_seconds)).await?;
Ok(())
}
pub(crate) async fn cache_delete_key(&self, key: &str) -> Result<(), DataLayerError> {
let Some(runner) = self.kv_runner() else {
return Ok(());
};
let _deleted = runner.del(key).await?;
Ok(())
}
pub(crate) async fn list_provider_catalog_providers_by_ids(
&self,
provider_ids: &[String],

View File

@@ -1,5 +1,6 @@
use aether_data::driver::redis::{RedisKvRunner, RedisKvRunnerConfig, RedisLockRunner};
use aether_data::{DataBackends, DataLayerError, DatabaseDriver};
use aether_runtime_state::RuntimeQueueStore;
use std::sync::Arc;
use super::{GatewayDataConfig, GatewayDataState, StoredSystemConfigEntry};
@@ -48,7 +49,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -86,7 +87,7 @@ impl GatewayDataState {
let usage_reader = backends.read().usage();
let usage_writer = backends.write().usage();
let user_reader = backends.read().users();
let usage_worker_runner = backends.workers().redis();
let usage_worker_queue = None;
let video_task_reader = backends.read().video_tasks();
let video_task_writer = backends.write().video_tasks();
let wallet_reader = backends.read().wallets();
@@ -124,7 +125,7 @@ impl GatewayDataState {
usage_writer,
user_reader,
user_preferences: None,
usage_worker_runner,
usage_worker_queue,
video_task_reader,
video_task_writer,
wallet_reader,
@@ -138,6 +139,14 @@ impl GatewayDataState {
self.backends.is_some()
}
pub(crate) fn with_usage_worker_queue(
mut self,
queue: Option<Arc<dyn RuntimeQueueStore>>,
) -> Self {
self.usage_worker_queue = queue;
self
}
pub(crate) fn has_database_maintenance_backend(&self) -> bool {
self.backends
.as_ref()
@@ -219,13 +228,6 @@ impl GatewayDataState {
self.global_model_writer.is_some()
}
pub(crate) fn has_redis_backend(&self) -> bool {
self.backends
.as_ref()
.and_then(|backends| backends.redis())
.is_some()
}
#[allow(dead_code)]
pub(crate) fn has_minimal_candidate_selection_reader(&self) -> bool {
self.minimal_candidate_selection_reader.is_some()
@@ -263,19 +265,6 @@ impl GatewayDataState {
.is_some_and(|backends| backends.has_system_config_backend())
}
pub(crate) fn oauth_refresh_lock_runner(&self) -> Option<RedisLockRunner> {
self.backends
.as_ref()
.and_then(|backends| backends.locks().redis())
}
pub(crate) fn kv_runner(&self) -> Option<RedisKvRunner> {
self.backends
.as_ref()
.and_then(|backends| backends.redis())
.and_then(|backend| backend.kv_runner(RedisKvRunnerConfig::default()).ok())
}
pub(crate) fn database_driver(&self) -> Option<DatabaseDriver> {
self.backends
.as_ref()
@@ -298,8 +287,8 @@ impl GatewayDataState {
self.usage_writer.is_some()
}
pub(crate) fn has_usage_worker_runner(&self) -> bool {
self.usage_worker_runner.is_some()
pub(crate) fn has_usage_worker_queue(&self) -> bool {
self.usage_worker_queue.is_some()
}
pub(crate) fn has_video_task_reader(&self) -> bool {

View File

@@ -1,6 +1,5 @@
use aether_billing::enrich_usage_event_with_billing;
use aether_billing::BillingModelContextLookup;
use aether_data::driver::redis::RedisStreamRunner;
use aether_data::repository::audit::RequestAuditReader;
use aether_data::repository::auth::{
AuthApiKeyLookupKey, ResolvedAuthApiKeySnapshotReader, StoredAuthApiKeySnapshot,
@@ -15,6 +14,7 @@ use aether_data_contracts::repository::provider_catalog::{
use aether_data_contracts::repository::settlement::{StoredUsageSettlement, UsageSettlementInput};
use aether_data_contracts::repository::usage::{StoredRequestUsageAudit, UpsertUsageRecord};
use aether_data_contracts::repository::video_tasks::{StoredVideoTask, VideoTaskLookupKey};
use aether_runtime_state::RuntimeQueueStore;
use aether_usage_runtime::{
UsageBillingEventEnricher, UsageBodyCapturePolicy, UsageEvent, UsageRecordWriter,
UsageRequestRecordLevel, UsageRuntimeAccess, UsageSettlementWriter,
@@ -242,12 +242,12 @@ impl UsageRuntimeAccess for GatewayDataState {
GatewayDataState::has_usage_writer(self)
}
fn has_usage_worker_runner(&self) -> bool {
GatewayDataState::has_usage_worker_runner(self)
fn has_usage_worker_queue(&self) -> bool {
GatewayDataState::has_usage_worker_queue(self)
}
fn usage_worker_runner(&self) -> Option<RedisStreamRunner> {
GatewayDataState::usage_worker_runner(self)
fn usage_worker_queue(&self) -> Option<std::sync::Arc<dyn RuntimeQueueStore>> {
GatewayDataState::usage_worker_queue(self)
}
async fn body_capture_policy(&self) -> Result<UsageBodyCapturePolicy, DataLayerError> {

View File

@@ -11,9 +11,6 @@ use crate::provider_transport::{
read_provider_transport_snapshot, GatewayProviderTransportSnapshot,
};
use crate::video_tasks::LocalVideoTaskReadResponse;
use aether_data::driver::redis::{
RedisKvRunner, RedisKvRunnerConfig, RedisLockRunner, RedisStreamRunner,
};
use aether_data::repository::announcements::{
AnnouncementListQuery, AnnouncementReadRepository, AnnouncementWriteRepository,
CreateAnnouncementRecord, StoredAnnouncement, StoredAnnouncementPage, UpdateAnnouncementRecord,
@@ -122,6 +119,7 @@ use aether_data_contracts::repository::video_tasks::{
StoredVideoTask, UpsertVideoTask, VideoTaskLookupKey, VideoTaskModelCount,
VideoTaskQueryFilter, VideoTaskReadRepository, VideoTaskStatusCount, VideoTaskWriteRepository,
};
use aether_runtime_state::RuntimeQueueStore;
#[derive(Clone, Default)]
pub(crate) struct GatewayDataState {
@@ -155,7 +153,7 @@ pub(crate) struct GatewayDataState {
usage_writer: Option<Arc<dyn UsageWriteRepository>>,
user_reader: Option<Arc<dyn UserReadRepository>>,
user_preferences: Option<Arc<RwLock<BTreeMap<String, StoredUserPreferenceRecord>>>>,
usage_worker_runner: Option<RedisStreamRunner>,
usage_worker_queue: Option<Arc<dyn RuntimeQueueStore>>,
video_task_reader: Option<Arc<dyn VideoTaskReadRepository>>,
video_task_writer: Option<Arc<dyn VideoTaskWriteRepository>>,
wallet_reader: Option<Arc<dyn WalletReadRepository>>,
@@ -253,10 +251,7 @@ impl fmt::Debug for GatewayDataState {
.field("has_usage_reader", &self.usage_reader.is_some())
.field("has_usage_writer", &self.usage_writer.is_some())
.field("has_user_preferences", &self.user_preferences.is_some())
.field(
"has_usage_worker_runner",
&self.usage_worker_runner.is_some(),
)
.field("has_usage_worker_queue", &self.usage_worker_queue.is_some())
.field("has_video_task_reader", &self.video_task_reader.is_some())
.field("has_video_task_writer", &self.video_task_writer.is_some())
.field("has_wallet_reader", &self.wallet_reader.is_some())

View File

@@ -13,27 +13,28 @@ use super::{
DisableAdminRedeemCodeBatchInput, DisableAdminRedeemCodeInput, FailAdminWalletRefundInput,
GatewayDataState, GatewayProviderTransportSnapshot, LocalVideoTaskReadResponse,
ProcessAdminWalletRefundInput, ProcessPaymentCallbackInput, ProcessPaymentCallbackOutcome,
RedeemWalletCodeInput, RedeemWalletCodeOutcome, RedisStreamRunner, RequestAuditBundle,
RequestCandidateTrace, StoredAdminAuditLogPage, StoredAdminPaymentCallbackPage,
StoredAdminPaymentOrder, StoredAdminPaymentOrderPage, StoredAdminRedeemCodeBatch,
StoredAdminRedeemCodeBatchPage, StoredAdminRedeemCodePage, StoredAdminWalletLedgerPage,
StoredAdminWalletListPage, StoredAdminWalletRefund, StoredAdminWalletRefundPage,
StoredAdminWalletRefundRequestPage, StoredAdminWalletTransaction,
StoredAdminWalletTransactionPage, StoredAnnouncement, StoredAnnouncementPage,
StoredBillingModelContext, StoredProviderQuotaSnapshot, StoredProviderUsageSummary,
StoredRequestUsageAudit, StoredSuspiciousActivity, StoredUsageSettlement,
StoredUserAuditLogPage, StoredUserAuthRecord, StoredUserExportRow, StoredUserSummary,
StoredVideoTask, StoredWalletDailyUsageLedger, StoredWalletDailyUsageLedgerPage,
StoredWalletSnapshot, UpdateAnnouncementRecord, UpsertUsageRecord, UpsertVideoTask,
UsageSettlementInput, VideoTaskLookupKey, VideoTaskModelCount, VideoTaskQueryFilter,
VideoTaskStatusCount, WalletDailyUsageAggregationInput, WalletDailyUsageAggregationResult,
WalletLookupKey, WalletMutationOutcome,
RedeemWalletCodeInput, RedeemWalletCodeOutcome, RequestAuditBundle, RequestCandidateTrace,
StoredAdminAuditLogPage, StoredAdminPaymentCallbackPage, StoredAdminPaymentOrder,
StoredAdminPaymentOrderPage, StoredAdminRedeemCodeBatch, StoredAdminRedeemCodeBatchPage,
StoredAdminRedeemCodePage, StoredAdminWalletLedgerPage, StoredAdminWalletListPage,
StoredAdminWalletRefund, StoredAdminWalletRefundPage, StoredAdminWalletRefundRequestPage,
StoredAdminWalletTransaction, StoredAdminWalletTransactionPage, StoredAnnouncement,
StoredAnnouncementPage, StoredBillingModelContext, StoredProviderQuotaSnapshot,
StoredProviderUsageSummary, StoredRequestUsageAudit, StoredSuspiciousActivity,
StoredUsageSettlement, StoredUserAuditLogPage, StoredUserAuthRecord, StoredUserExportRow,
StoredUserSummary, StoredVideoTask, StoredWalletDailyUsageLedger,
StoredWalletDailyUsageLedgerPage, StoredWalletSnapshot, UpdateAnnouncementRecord,
UpsertUsageRecord, UpsertVideoTask, UsageSettlementInput, VideoTaskLookupKey,
VideoTaskModelCount, VideoTaskQueryFilter, VideoTaskStatusCount,
WalletDailyUsageAggregationInput, WalletDailyUsageAggregationResult, WalletLookupKey,
WalletMutationOutcome,
};
use aether_data_contracts::repository::usage::{
PendingUsageCleanupSummary, ProviderApiKeyWindowUsageRequest,
StoredProviderApiKeyWindowUsageSummary, StoredUsageDailySummary, UsageAuditListQuery,
UsageCleanupSummary, UsageCleanupWindow, UsageDailyHeatmapQuery,
};
use aether_runtime_state::RuntimeQueueStore;
use aether_video_tasks_core::read_data_backed_video_task_response;
impl GatewayDataState {
@@ -1477,8 +1478,8 @@ impl GatewayDataState {
}
}
pub(crate) fn usage_worker_runner(&self) -> Option<RedisStreamRunner> {
self.usage_worker_runner.clone()
pub(crate) fn usage_worker_queue(&self) -> Option<std::sync::Arc<dyn RuntimeQueueStore>> {
self.usage_worker_queue.clone()
}
pub(crate) async fn find_billing_model_context(

View File

@@ -40,7 +40,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -90,7 +90,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,

View File

@@ -73,7 +73,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -122,7 +122,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -167,7 +167,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -300,7 +300,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -361,7 +361,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -415,7 +415,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -478,7 +478,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -523,7 +523,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -569,7 +569,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -626,7 +626,7 @@ impl GatewayDataState {
usage_writer: Some(usage_writer),
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -685,7 +685,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -728,7 +728,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -786,7 +786,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: Some(repository),
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -837,7 +837,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: Some(user_repository),
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: Some(wallet_reader),
@@ -893,7 +893,7 @@ impl GatewayDataState {
usage_writer: Some(usage_writer),
user_reader: Some(user_repository),
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: Some(wallet_reader),
@@ -950,7 +950,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: Some(user_repository),
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: Some(wallet_reader),
@@ -1006,7 +1006,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1051,7 +1051,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1096,7 +1096,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1153,7 +1153,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1215,7 +1215,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1260,7 +1260,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1310,7 +1310,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1377,7 +1377,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1439,7 +1439,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1485,7 +1485,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1531,7 +1531,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1579,7 +1579,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1625,7 +1625,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1671,7 +1671,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1725,7 +1725,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1780,7 +1780,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1838,7 +1838,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1902,7 +1902,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -1967,7 +1967,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -2036,7 +2036,7 @@ impl GatewayDataState {
usage_writer: Some(usage_writer),
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -2112,7 +2112,7 @@ impl GatewayDataState {
usage_writer: Some(usage_writer),
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: Some(wallet_reader),
@@ -2170,7 +2170,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -2219,7 +2219,7 @@ impl GatewayDataState {
usage_writer: Some(usage_writer),
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -2264,7 +2264,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,
@@ -2315,7 +2315,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: Some(wallet_reader),
@@ -2370,7 +2370,7 @@ impl GatewayDataState {
usage_writer: Some(usage_writer),
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: Some(wallet_reader),
@@ -2426,7 +2426,7 @@ impl GatewayDataState {
usage_writer: Some(usage_writer),
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: Some(wallet_reader),
@@ -2475,7 +2475,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: None,
video_task_writer: None,
wallet_reader: None,

View File

@@ -44,7 +44,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: Some(repository),
video_task_writer: None,
wallet_reader: None,
@@ -96,7 +96,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: Some(video_task_reader),
video_task_writer: Some(video_task_writer),
wallet_reader: None,
@@ -145,7 +145,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: Some(video_task_reader),
video_task_writer: Some(video_task_writer),
wallet_reader: None,
@@ -198,7 +198,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: Some(video_task_reader),
video_task_writer: Some(video_task_writer),
wallet_reader: None,
@@ -255,7 +255,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: Some(video_task_reader),
video_task_writer: Some(video_task_writer),
wallet_reader: None,
@@ -321,7 +321,7 @@ impl GatewayDataState {
usage_writer: None,
user_reader: None,
user_preferences: None,
usage_worker_runner: None,
usage_worker_queue: None,
video_task_reader: Some(video_task_reader),
video_task_writer: Some(video_task_writer),
wallet_reader: None,