Skip to content

Commit 1a760b5

Browse files
committed
[ci] fmt
Signed-off-by: Itai Segall <[email protected]>
1 parent 66d983c commit 1a760b5

File tree

4 files changed

+58
-28
lines changed

4 files changed

+58
-28
lines changed

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/store/db/DbValidatorInternalStore.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@ class DbValidatorInternalStore private (
3434
val profile: JdbcProfile = storage.profile.jdbc
3535

3636
override def setValue[T](key: String, value: T)(implicit
37-
tc: TraceContext,
38-
encoder: Encoder[T],
37+
tc: TraceContext,
38+
encoder: Encoder[T],
3939
): Future[Unit] = {
4040
val jsonValue: Json = value.asJson
4141

42-
val action = sql"""INSERT INTO ${dbTableConfig.tableName} (${dbTableConfig.keyColumnName}, ${dbTableConfig.valueColumnName}, store_id)
42+
val action =
43+
sql"""INSERT INTO ${dbTableConfig.tableName} (${dbTableConfig.keyColumnName}, ${dbTableConfig.valueColumnName}, store_id)
4344
VALUES ($key, $jsonValue, $storeId)
4445
ON CONFLICT (store_id, ${dbTableConfig.keyColumnName}) DO UPDATE
4546
SET ${dbTableConfig.keyColumnName} = excluded.${dbTableConfig.keyColumnName}""".asUpdate
@@ -87,7 +88,7 @@ class DbValidatorInternalStore private (
8788
}
8889

8990
override def deleteKey(key: String)(implicit
90-
tc: TraceContext
91+
tc: TraceContext
9192
): Future[Unit] = {
9293
logger.debug(
9394
s"Deleting config key $key"

apps/validator/src/main/scala/org/lfdecentralizedtrust/splice/validator/ValidatorApp.scala

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ import org.apache.pekko.http.scaladsl.server.directives.BasicDirectives
3232
import org.lfdecentralizedtrust.splice.admin.api.TraceContextDirectives.withTraceContext
3333
import org.lfdecentralizedtrust.splice.admin.http.{AdminRoutes, HttpErrorHandler}
3434
import org.lfdecentralizedtrust.splice.auth.*
35-
import org.lfdecentralizedtrust.splice.automation.{DomainParamsAutomationService, DomainTimeAutomationService}
35+
import org.lfdecentralizedtrust.splice.automation.{
36+
DomainParamsAutomationService,
37+
DomainTimeAutomationService,
38+
}
3639
import org.lfdecentralizedtrust.splice.config.{NetworkAppClientConfig, SharedSpliceAppParameters}
3740
import org.lfdecentralizedtrust.splice.environment.*
3841
import org.lfdecentralizedtrust.splice.environment.ledger.api.DedupDuration
@@ -45,10 +48,19 @@ import org.lfdecentralizedtrust.splice.http.v0.validator_admin.ValidatorAdminRes
4548
import org.lfdecentralizedtrust.splice.http.v0.validator_public.ValidatorPublicResource
4649
import org.lfdecentralizedtrust.splice.http.v0.wallet.WalletResource as InternalWalletResource
4750
import org.lfdecentralizedtrust.splice.identities.NodeIdentitiesStore
48-
import org.lfdecentralizedtrust.splice.migration.{DomainDataRestorer, DomainMigrationInfo, MigrationTimeInfo, ParticipantUsersDataRestorer}
51+
import org.lfdecentralizedtrust.splice.migration.{
52+
DomainDataRestorer,
53+
DomainMigrationInfo,
54+
MigrationTimeInfo,
55+
ParticipantUsersDataRestorer,
56+
}
4957
import org.lfdecentralizedtrust.splice.scan.admin.api.client
5058
import org.lfdecentralizedtrust.splice.scan.admin.api.client.BftScanConnection.BftScanClientConfig
51-
import org.lfdecentralizedtrust.splice.scan.admin.api.client.{BftScanConnection, MinimalScanConnection, SingleScanConnection}
59+
import org.lfdecentralizedtrust.splice.scan.admin.api.client.{
60+
BftScanConnection,
61+
MinimalScanConnection,
62+
SingleScanConnection,
63+
}
5264
import org.lfdecentralizedtrust.splice.scan.config.ScanAppClientConfig
5365
import org.lfdecentralizedtrust.splice.setup.{NodeInitializer, ParticipantInitializer}
5466
import org.lfdecentralizedtrust.splice.store.AppStoreWithIngestion.SpliceLedgerConnectionPriority
@@ -58,14 +70,29 @@ import org.lfdecentralizedtrust.splice.store.{AppStoreWithIngestion, HistoryMetr
5870
import org.lfdecentralizedtrust.splice.util.*
5971
import org.lfdecentralizedtrust.splice.validator.ValidatorApp.OAuthRealms
6072
import org.lfdecentralizedtrust.splice.validator.admin.http.*
61-
import org.lfdecentralizedtrust.splice.validator.automation.{ValidatorAutomationService, ValidatorPackageVettingTrigger}
73+
import org.lfdecentralizedtrust.splice.validator.automation.{
74+
ValidatorAutomationService,
75+
ValidatorPackageVettingTrigger,
76+
}
6277
import org.lfdecentralizedtrust.splice.validator.config.*
6378
import org.lfdecentralizedtrust.splice.validator.domain.DomainConnector
6479
import org.lfdecentralizedtrust.splice.validator.metrics.ValidatorAppMetrics
65-
import org.lfdecentralizedtrust.splice.validator.migration.{DomainMigrationDump, ParticipantPartyMigrator}
66-
import org.lfdecentralizedtrust.splice.validator.store.{ValidatorConfigProvider, ValidatorInternalStore, ValidatorStore}
80+
import org.lfdecentralizedtrust.splice.validator.migration.{
81+
DomainMigrationDump,
82+
ParticipantPartyMigrator,
83+
}
84+
import org.lfdecentralizedtrust.splice.validator.store.{
85+
ValidatorConfigProvider,
86+
ValidatorInternalStore,
87+
ValidatorStore,
88+
}
6789
import org.lfdecentralizedtrust.splice.validator.util.{ValidatorScanConnection, ValidatorUtil}
68-
import org.lfdecentralizedtrust.splice.wallet.admin.http.{HttpExternalWalletHandler, HttpStatusWalletHandler, HttpWalletHandler, UserWalletAuthExtractor}
90+
import org.lfdecentralizedtrust.splice.wallet.admin.http.{
91+
HttpExternalWalletHandler,
92+
HttpStatusWalletHandler,
93+
HttpWalletHandler,
94+
UserWalletAuthExtractor,
95+
}
6996
import org.lfdecentralizedtrust.splice.wallet.automation.UserWalletAutomationService
7097
import org.lfdecentralizedtrust.splice.wallet.util.ValidatorTopupConfig
7198
import org.lfdecentralizedtrust.splice.wallet.{ExternalPartyWalletManager, UserWalletManager}
@@ -173,9 +200,9 @@ class ValidatorApp(
173200
participantId,
174201
validatorParty = ParticipantPartyMigrator.toPartyId(
175202
config.validatorPartyHint
176-
.getOrElse(
177-
BaseLedgerConnection.sanitizeUserIdToPartyString(config.ledgerApiUser)
178-
),
203+
.getOrElse(
204+
BaseLedgerConnection.sanitizeUserIdToPartyString(config.ledgerApiUser)
205+
),
179206
participantId,
180207
),
181208
storage,

apps/validator/src/main/scala/org/lfdecentralizedtrust/splice/validator/store/ValidatorConfigProvider.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ class ValidatorConfigProvider(config: KeyValueStore, val loggerFactory: NamedLog
4646
tc: TraceContext,
4747
ec: ExecutionContext,
4848
): OptionT[Future, Set[PartyId]] = {
49-
config.readValueAndLogOnDecodingFailure[PartiesBeingMigrated](migratingPartiesInternalConfigKey).map(
50-
_.parties
51-
)
49+
config
50+
.readValueAndLogOnDecodingFailure[PartiesBeingMigrated](migratingPartiesInternalConfigKey)
51+
.map(
52+
_.parties
53+
)
5254
}
5355

5456
def setPartiesToMigrate(parties: Set[PartyId])(implicit tc: TraceContext): Future[Unit] = {

apps/validator/src/main/scala/org/lfdecentralizedtrust/splice/validator/store/ValidatorInternalStore.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import scala.concurrent.{ExecutionContext, Future}
1212

1313
object ValidatorInternalStore {
1414
def apply(
15-
participantId: ParticipantId,
16-
validatorParty: PartyId,
17-
storage: DbStorage,
18-
loggerFactory: NamedLoggerFactory,
19-
)(implicit
20-
ec: ExecutionContext,
21-
lc: ErrorLoggingContext,
22-
cc: CloseContext,
23-
tc: TraceContext,
24-
): Future[KeyValueStore] = {
15+
participantId: ParticipantId,
16+
validatorParty: PartyId,
17+
storage: DbStorage,
18+
loggerFactory: NamedLoggerFactory,
19+
)(implicit
20+
ec: ExecutionContext,
21+
lc: ErrorLoggingContext,
22+
cc: CloseContext,
23+
tc: TraceContext,
24+
): Future[KeyValueStore] = {
2525
KeyValueStore(
2626
StoreDescriptor(
2727
version = 2,
@@ -34,7 +34,7 @@ object ValidatorInternalStore {
3434
),
3535
KeyValueStoreDbTableConfig("validator_internal_config", "config_key", "config_value"),
3636
storage,
37-
loggerFactory
37+
loggerFactory,
3838
)
3939
}
4040
}

0 commit comments

Comments
 (0)