From 07c0d7bfff6efb9646934a6a0cb836c51c32e30c Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Tue, 9 Jan 2024 17:01:52 +0100 Subject: [PATCH] spec: Fix import paths in specs --- Specs/Quint/specs/driver.qnt | 4 ++-- Specs/Quint/specs/statemachineAsync.qnt | 2 +- Specs/Quint/specs/votekeeper.qnt | 4 ++-- Specs/Quint/spells/extra.qnt | 2 +- Specs/Quint/tests/consensus/consensusTest.qnt | 4 ++-- Specs/Quint/tests/disagreement/disagreementRun.qnt | 2 +- Specs/Quint/tests/line28/line28run.qnt | 4 ++-- Specs/Quint/tests/line42/line42run.qnt | 2 +- Specs/Quint/tests/multi-round/someMultiRoundRuns.qnt | 4 ++-- Specs/Quint/tests/state-machine/parameterizedTest.qnt | 8 ++++---- Specs/Quint/tests/state-machine/statemachineTest.qnt | 10 +++++----- Specs/Quint/tests/votekeeper/voteBookkeeperModels.qnt | 4 ++-- Specs/Quint/tests/votekeeper/voteBookkeeperTest.qnt | 4 ++-- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Specs/Quint/specs/driver.qnt b/Specs/Quint/specs/driver.qnt index 30d687734..c03380535 100644 --- a/Specs/Quint/specs/driver.qnt +++ b/Specs/Quint/specs/driver.qnt @@ -6,10 +6,10 @@ */ module driver { - import extraSpells.* from "./extraSpells" + import extraSpells.* from "../spells/extra" import types.* from "./types" import consensus.* from "./consensus" - import voteBookkeeper.* from "./voteBookkeeper" + import voteBookkeeper.* from "./votekeeper" // ************************************************************************* // State diff --git a/Specs/Quint/specs/statemachineAsync.qnt b/Specs/Quint/specs/statemachineAsync.qnt index ed7753d03..b40381218 100644 --- a/Specs/Quint/specs/statemachineAsync.qnt +++ b/Specs/Quint/specs/statemachineAsync.qnt @@ -21,7 +21,7 @@ import driver.* from "./driver" export driver.* import consensus.* from "./consensus" export consensus.* -import voteBookkeeper.* from "./voteBookkeeper" +import voteBookkeeper.* from "./votekeeper" const validators: Set[Address] const validatorSet: Address -> Weight diff --git a/Specs/Quint/specs/votekeeper.qnt b/Specs/Quint/specs/votekeeper.qnt index 179c886d2..e32c82203 100644 --- a/Specs/Quint/specs/votekeeper.qnt +++ b/Specs/Quint/specs/votekeeper.qnt @@ -3,8 +3,8 @@ module voteBookkeeper { import types.* from "./types" - import basicSpells.* from "./basicSpells" - import extraSpells.* from "./extraSpells" + import basicSpells.* from "../spells/basic" + import extraSpells.* from "../spells/extra" // **************************************************************************** // Types diff --git a/Specs/Quint/spells/extra.qnt b/Specs/Quint/spells/extra.qnt index 9e9ff013e..7d797c8da 100644 --- a/Specs/Quint/spells/extra.qnt +++ b/Specs/Quint/spells/extra.qnt @@ -8,7 +8,7 @@ */ module extraSpells { - import basicSpells.* from "./basicSpells" + import basicSpells.* from "./basic" pure def printVariable(name: str, variable: a): bool = true diff --git a/Specs/Quint/tests/consensus/consensusTest.qnt b/Specs/Quint/tests/consensus/consensusTest.qnt index 526a41afb..e743b04d0 100644 --- a/Specs/Quint/tests/consensus/consensusTest.qnt +++ b/Specs/Quint/tests/consensus/consensusTest.qnt @@ -2,8 +2,8 @@ module consensusTest { - import types.* from "./types" - import consensus.* from "./consensus" + import types.* from "../../specs/types" + import consensus.* from "../../specs/consensus" // ************************************************************************* // Consensus state machine diff --git a/Specs/Quint/tests/disagreement/disagreementRun.qnt b/Specs/Quint/tests/disagreement/disagreementRun.qnt index 603e707c7..8924ee728 100644 --- a/Specs/Quint/tests/disagreement/disagreementRun.qnt +++ b/Specs/Quint/tests/disagreement/disagreementRun.qnt @@ -2,7 +2,7 @@ module disagreementRun { -import TendermintDSL.* from "./TendermintDSL" +import TendermintDSL.* from "../../specs/TendermintDSL" export TendermintDSL.* const groupA : Set[Address] diff --git a/Specs/Quint/tests/line28/line28run.qnt b/Specs/Quint/tests/line28/line28run.qnt index 79da267c8..dde076f78 100644 --- a/Specs/Quint/tests/line28/line28run.qnt +++ b/Specs/Quint/tests/line28/line28run.qnt @@ -2,7 +2,7 @@ module line28run { -import TendermintDSL.* from "./TendermintDSL" +import TendermintDSL.* from "../../specs/TendermintDSL" export TendermintDSL.* const otherSet: Set[Address] @@ -36,4 +36,4 @@ run runToLine28 = unchangedAll }) -} \ No newline at end of file +} diff --git a/Specs/Quint/tests/line42/line42run.qnt b/Specs/Quint/tests/line42/line42run.qnt index 469d4e5b5..d1d003293 100644 --- a/Specs/Quint/tests/line42/line42run.qnt +++ b/Specs/Quint/tests/line42/line42run.qnt @@ -2,7 +2,7 @@ module line42run { -import TendermintDSL.* from "./TendermintDSL" +import TendermintDSL.* from "../../specs/TendermintDSL" export TendermintDSL.* const testedVal : Address diff --git a/Specs/Quint/tests/multi-round/someMultiRoundRuns.qnt b/Specs/Quint/tests/multi-round/someMultiRoundRuns.qnt index 9599f05ee..77c739ee7 100644 --- a/Specs/Quint/tests/multi-round/someMultiRoundRuns.qnt +++ b/Specs/Quint/tests/multi-round/someMultiRoundRuns.qnt @@ -2,7 +2,7 @@ module someMultiRoundRuns { -import TendermintDSL.* from "./TendermintDSL" +import TendermintDSL.* from "../../specs/TendermintDSL" export TendermintDSL.* const slow : Address @@ -104,4 +104,4 @@ run RoundswitchRun = { -} \ No newline at end of file +} diff --git a/Specs/Quint/tests/state-machine/parameterizedTest.qnt b/Specs/Quint/tests/state-machine/parameterizedTest.qnt index e6da5dfc8..3ab2c9987 100644 --- a/Specs/Quint/tests/state-machine/parameterizedTest.qnt +++ b/Specs/Quint/tests/state-machine/parameterizedTest.qnt @@ -2,8 +2,8 @@ module parameterizedTest { -import types.* from "./types" -import extraSpells.* from "./extraSpells" +import types.* from "../../specs/types" +import extraSpells.* from "./../spells/extra" import statemachineAsync( validators = Set("v1", "v2", "v3", "v4"), validatorSet = Set("v1", "v2", "v3", "v4").mapBy(x => 1), @@ -11,7 +11,7 @@ import statemachineAsync( Values = Set("a", "b"), Rounds = Set(0, 1, 2, 3), Heights = Set(0) // , 1, 2, 3) -) as N4F0 from "./statemachineAsync" +) as N4F0 from "../../specs/statemachineAsync" val validatorList = N4F0::validators.fold(List(), (s, x) => s.append(x)) @@ -96,4 +96,4 @@ run multiRoundTest = { -} \ No newline at end of file +} diff --git a/Specs/Quint/tests/state-machine/statemachineTest.qnt b/Specs/Quint/tests/state-machine/statemachineTest.qnt index 1f7156b1e..57dd6ba2e 100644 --- a/Specs/Quint/tests/state-machine/statemachineTest.qnt +++ b/Specs/Quint/tests/state-machine/statemachineTest.qnt @@ -12,11 +12,11 @@ module statemachineTest { -import types.* from "./types" -import extraSpells.* from "./extraSpells" -import driver.* from "./driver" -import consensus.* from "./consensus" -import voteBookkeeper.* from "./voteBookkeeper" +import types.* from "../../specs/types" +import extraSpells.* from "../../spells/extra" +import driver.* from "../../specs/driver" +import consensus.* from "../../specs/consensus" +import voteBookkeeper.* from "../../votekeeper" val validators = Set("v1", "v2", "v3", "v4") val validatorSet = validators.mapBy(x => 1) diff --git a/Specs/Quint/tests/votekeeper/voteBookkeeperModels.qnt b/Specs/Quint/tests/votekeeper/voteBookkeeperModels.qnt index f6d39bc74..47e8189b1 100644 --- a/Specs/Quint/tests/votekeeper/voteBookkeeperModels.qnt +++ b/Specs/Quint/tests/votekeeper/voteBookkeeperModels.qnt @@ -6,8 +6,8 @@ module voteBookkeeperSM { - import types.* from "./types" - import voteBookkeeper.* from "./voteBookkeeper" + import types.* from "../../specs/types" + import voteBookkeeper.* from "../../specs/votekeeper" export voteBookkeeper.* // ************************************************************************ diff --git a/Specs/Quint/tests/votekeeper/voteBookkeeperTest.qnt b/Specs/Quint/tests/votekeeper/voteBookkeeperTest.qnt index d37d5f9c4..fecaa06db 100644 --- a/Specs/Quint/tests/votekeeper/voteBookkeeperTest.qnt +++ b/Specs/Quint/tests/votekeeper/voteBookkeeperTest.qnt @@ -2,8 +2,8 @@ module voteBookkeeperTest { - import types.* from "./types" - import voteBookkeeper.* from "./voteBookkeeper" + import types.* from "../../specs/types" + import voteBookkeeper.* from "../../specs/votekeeper" // **************************************************************************** // Tests