From 588e911ad6e0fa2e2b3130fe0948e5c6068c61f1 Mon Sep 17 00:00:00 2001 From: Ekaterina Pavlova Date: Mon, 12 Feb 2024 00:01:34 +0300 Subject: [PATCH] config: fix TestRun_WithNewVMContextAndBreakpoints path for windows Fix VM test for windows. We don't have notary enabled in unit testchains so it was removed. Close #3309 Signed-off-by: Ekaterina Pavlova --- cli/vm/cli_test.go | 7 +++---- config/protocol.unit_testnet.single.yml | 5 ----- config/protocol.unit_testnet.yml | 5 ----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/cli/vm/cli_test.go b/cli/vm/cli_test.go index 24bdbe7cc..1f96a17aa 100644 --- a/cli/vm/cli_test.go +++ b/cli/vm/cli_test.go @@ -93,12 +93,11 @@ func newTestVMCLIWithLogoAndCustomConfig(t *testing.T, printLogo bool, cfg *conf } var c config.Config if cfg == nil { - configPath := "../../config/protocol.unit_testnet.single.yml" + configPath := filepath.Join("..", "..", "config", "protocol.unit_testnet.single.yml") var err error - c, err = config.LoadFile(configPath, "../../config") + c, err = config.LoadFile(configPath, filepath.Join("..", "..", "config")) require.NoError(t, err, "could not load chain config") - require.Equal(t, "../../testdata/wallet1_solo.json", c.ApplicationConfiguration.Consensus.UnlockWallet.Path) - require.Equal(t, "/notary_wallet.json", c.ApplicationConfiguration.P2PNotary.UnlockWallet.Path) + require.Equal(t, filepath.Join("..", "..", "testdata", "wallet1_solo.json"), c.ApplicationConfiguration.Consensus.UnlockWallet.Path) c.ApplicationConfiguration.DBConfiguration.Type = dbconfig.InMemoryDB } else { c = *cfg diff --git a/config/protocol.unit_testnet.single.yml b/config/protocol.unit_testnet.single.yml index a7b08ce06..077c8d10c 100644 --- a/config/protocol.unit_testnet.single.yml +++ b/config/protocol.unit_testnet.single.yml @@ -38,11 +38,6 @@ ApplicationConfiguration: UnlockWallet: Path: "../testdata/wallet1_solo.json" Password: "one" - P2PNotary: - Enabled: false - UnlockWallet: - Path: "/notary_wallet.json" - Password: "pass" RPC: MaxGasInvoke: 15 Enabled: true diff --git a/config/protocol.unit_testnet.yml b/config/protocol.unit_testnet.yml index 97170f502..d2753f6e1 100644 --- a/config/protocol.unit_testnet.yml +++ b/config/protocol.unit_testnet.yml @@ -42,11 +42,6 @@ ApplicationConfiguration: AttemptConnPeers: 5 MinPeers: 0 Relay: true - P2PNotary: - Enabled: false - UnlockWallet: - Path: "/notary_wallet.json" - Password: "pass" RPC: MaxGasInvoke: 15 Enabled: true