Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ import org.lfdecentralizedtrust.splice.codegen.java.splice.api.token.test.dummyh
import org.lfdecentralizedtrust.splice.config.ConfigTransforms.{
ConfigurableApp,
updateAutomationConfig,
updateAllScanAppConfigs_,
}
import org.lfdecentralizedtrust.splice.config.RateLimitersConfig
import org.lfdecentralizedtrust.splice.console.LedgerApiExtensions.RichPartyId
import org.lfdecentralizedtrust.splice.http.v0.definitions
import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
Expand All @@ -54,7 +56,7 @@ import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.{
IntegrationTestWithSharedEnvironment,
SpliceTestConsoleEnvironment,
}
import org.lfdecentralizedtrust.splice.util.{TimeTestUtil, WalletTestUtil}
import org.lfdecentralizedtrust.splice.util.{SpliceRateLimitConfig, TimeTestUtil, WalletTestUtil}
import org.lfdecentralizedtrust.splice.wallet.admin.api.client.commands.HttpWalletAppClient
import org.lfdecentralizedtrust.splice.wallet.automation.CollectRewardsAndMergeAmuletsTrigger
import org.lfdecentralizedtrust.tokenstandard.transferinstruction
Expand Down Expand Up @@ -105,6 +107,16 @@ class TokenStandardCliTestDataTimeBasedIntegrationTest
_.withPausedTrigger[CollectRewardsAndMergeAmuletsTrigger]
)(config)
)
.addConfigTransforms((_, config) =>
// The test itself may hit scan hard, but this test is not about testing rate limiting...
updateAllScanAppConfigs_(config =>
config.copy(parameters =
config.parameters.copy(rateLimiting =
RateLimitersConfig(SpliceRateLimitConfig(enabled = false, 1), Map.empty)
)
)
)(config)
)
}

private val interfaces: Seq[Identifier] =
Expand Down Expand Up @@ -678,7 +690,8 @@ class TokenStandardCliTestDataTimeBasedIntegrationTest
)
def replaceStringsInJson(viewValue: Json) = {
val current = viewValue.spaces2SortKeys
val amuletRulesId = sv1ScanBackend.getAmuletRules().contractId.contractId
val amuletRulesId =
eventuallySucceeds()(sv1ScanBackend.getAmuletRules().contractId.contractId)
val allContracts =
"\"([0-9a-fA-F]{138})\"".r.findAllIn(current).matchData.map(_.group(1)).toSeq

Expand Down
Loading