Skip to content
Open
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,6 @@ docs/src/deployment/observability/metrics_reference.rst
/.vagrant/
/vagrant-nix-cache/
lnav*work

# VS Code
.vscode/
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ class AppUpgradeIntegrationTest
amuletConfig.transferPreapprovalBaseDuration,
amuletConfig.developmentFundManagerBlacklist,
amuletConfig.minDevelopmentFundMintingDelay,
amuletConfig.amuletSwitchOverTimes,
)
val upgradeAction = new ARC_AmuletRules(
new CRARC_SetConfig(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ class BootstrapPackageConfigIntegrationTest
amuletConfig.transferPreapprovalBaseDuration,
amuletConfig.developmentFundManagerBlacklist,
amuletConfig.minDevelopmentFundMintingDelay,
amuletConfig.amuletSwitchOverTimes,
)

val upgradeAction = new ARC_AmuletRules(
Expand Down Expand Up @@ -395,6 +396,7 @@ class BootstrapPackageConfigIntegrationTest
amuletConfig.transferPreapprovalBaseDuration,
amuletConfig.developmentFundManagerBlacklist,
amuletConfig.minDevelopmentFundMintingDelay,
amuletConfig.amuletSwitchOverTimes,
)

val upgradeAction = new ARC_AmuletRules(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ class DevelopmentFundFrontendTimeBasedIntegrationTest
existingConfig.transferPreapprovalBaseDuration,
existingConfig.developmentFundManagerBlacklist,
existingConfig.minDevelopmentFundMintingDelay,
existingConfig.amuletSwitchOverTimes,
)

val action = new ARC_AmuletRules(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ class SvReconcileSynchronizerConfigIntegrationTest extends SvIntegrationTestBase
amuletConfig.transferPreapprovalBaseDuration,
amuletConfig.developmentFundManagerBlacklist,
amuletConfig.minDevelopmentFundMintingDelay,
amuletConfig.amuletSwitchOverTimes,
)

}
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ class SvStateManagementIntegrationTest extends SvIntegrationTestBase with Trigge
sv1Backend.getDsoInfo().dsoRules.payload.config.nextScheduledSynchronizerUpgrade,
sv1Backend.getDsoInfo().dsoRules.payload.config.voteCooldownTime,
sv1Backend.getDsoInfo().dsoRules.payload.config.nextScheduledLogicalSynchronizerUpgrade,
sv1Backend.getDsoInfo().dsoRules.payload.config.svOperationsSwitchOverTimes,
)

val action: ActionRequiringConfirmation =
Expand Down Expand Up @@ -508,6 +509,7 @@ class SvStateManagementIntegrationTest extends SvIntegrationTestBase with Trigge
initialConfig.transferPreapprovalBaseDuration,
initialConfig.developmentFundManagerBlacklist,
initialConfig.minDevelopmentFundMintingDelay,
initialConfig.amuletSwitchOverTimes,
)

val (_, voteRequestCid) = actAndCheck(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ class SvTimeBasedOnboardingIntegrationTest
.payload
.config
.nextScheduledLogicalSynchronizerUpgrade,
sv1Backend
.getDsoInfo()
.dsoRules
.payload
.config
.svOperationsSwitchOverTimes,
)

val action: ActionRequiringConfirmation =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,7 @@ class TrafficBasedRewardsSvAppTimeBasedIntegrationTest
existing.transferPreapprovalBaseDuration,
existing.developmentFundManagerBlacklist,
existing.minDevelopmentFundMintingDelay,
existing.amuletSwitchOverTimes,
)
setAmuletConfig(Seq((None, newConfig, existing)))
eventually() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ class UnsupportedPackageVettingIntegrationTest
currentConfig.transferPreapprovalBaseDuration,
currentConfig.developmentFundManagerBlacklist,
currentConfig.minDevelopmentFundMintingDelay,
currentConfig.amuletSwitchOverTimes,
)
setAmuletConfig(Seq((None, newAmuletConfig, currentConfig)))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ trait AmuletConfigUtil extends TestCommon {
existingAmuletConfig.transferPreapprovalBaseDuration,
existingAmuletConfig.developmentFundManagerBlacklist,
existingAmuletConfig.minDevelopmentFundMintingDelay,
existingAmuletConfig.amuletSwitchOverTimes,
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ trait SvTestUtil extends TestCommon {
domainUpgradeSchedule.toJava,
dsoRulesConfig.voteCooldownTime,
dsoRulesConfig.nextScheduledLogicalSynchronizerUpgrade,
dsoRulesConfig.svOperationsSwitchOverTimes,
)

private def updateNextScheduledLogicalSynchronizerUpgrade(
Expand All @@ -347,6 +348,7 @@ trait SvTestUtil extends TestCommon {
dsoRulesConfig.nextScheduledSynchronizerUpgrade,
dsoRulesConfig.voteCooldownTime,
schedule.toJava,
dsoRulesConfig.svOperationsSwitchOverTimes,
)

def computeAmuletsToIssueToSvs(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export function getAmuletRulesConfig(
baseRateTrafficLimitsBurstWindow: string = '1200000000'
): AmuletConfig<USD> {
return {
amuletSwitchOverTimes: null,
packageConfig: {
amuletNameService: '0.1.8',
walletPayments: '0.1.8',
Expand Down Expand Up @@ -460,7 +461,10 @@ export function getExpectedAmuletRulesConfigDiffsHTML(
class="jsondiffpatch-unchanged"
data-key="minDevelopmentFundMintingDelay"><div
class="jsondiffpatch-property-name">minDevelopmentFundMintingDelay</div><div
class="jsondiffpatch-value"><pre>null</pre></div></li></ul></div>
class="jsondiffpatch-value"><pre>null</pre></div></li><li
class="jsondiffpatch-unchanged" data-key="amuletSwitchOverTimes"><div
class="jsondiffpatch-property-name">amuletSwitchOverTimes</div><div
class="jsondiffpatch-value"><pre>null</pre></div></li></ul></div>
`;
return mock;
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export function getDsoRulesConfig(
? nextScheduledSynchronizerUpgrade
: null,
nextScheduledLogicalSynchronizerUpgrade: null,
svOperationsSwitchOverTimes: null,
actionConfirmationTimeout: {
microseconds: '3600000000',
},
Expand Down Expand Up @@ -224,6 +225,9 @@ export function getExpectedDsoRulesConfigDiffsHTML(
}</pre></div></li><li class="jsondiffpatch-unchanged"
data-key="nextScheduledLogicalSynchronizerUpgrade"><div
class="jsondiffpatch-property-name">nextScheduledLogicalSynchronizerUpgrade</div><div
class="jsondiffpatch-value"><pre>null</pre></div></li><li
class="jsondiffpatch-unchanged" data-key="svOperationsSwitchOverTimes"><div
class="jsondiffpatch-property-name">svOperationsSwitchOverTimes</div><div
class="jsondiffpatch-value"><pre>null</pre></div></li></ul></div>
`;

Expand Down Expand Up @@ -325,6 +329,9 @@ export function getExpectedDsoRulesConfigDiffsHTML(
}</pre></div></li><li class="jsondiffpatch-unchanged"
data-key="nextScheduledLogicalSynchronizerUpgrade"><div
class="jsondiffpatch-property-name">nextScheduledLogicalSynchronizerUpgrade</div><div
class="jsondiffpatch-value"><pre>null</pre></div></li><li
class="jsondiffpatch-unchanged" data-key="svOperationsSwitchOverTimes"><div
class="jsondiffpatch-property-name">svOperationsSwitchOverTimes</div><div
class="jsondiffpatch-value"><pre>null</pre></div></li></ul></div>
`;

Expand Down
1 change: 1 addition & 0 deletions apps/common/frontend/src/__tests__/mocks/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ export const plannedVoteResult: DsoRules_CloseVoteRequestResult = {
transferPreapprovalBaseDuration: null,
developmentFundManagerBlacklist: null,
minDevelopmentFundMintingDelay: null,
amuletSwitchOverTimes: null,
},
},
},
Expand Down
Loading
Loading