From 36a8c48373e9a56a0aef909a5e1b241c325e2f6d Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Sun, 13 Aug 2023 15:06:03 -0400 Subject: [PATCH 1/2] build: fix cosmic-swing dep on builders Actually needed at runtime --- packages/builders/package.json | 1 - packages/cosmic-swingset/package.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/builders/package.json b/packages/builders/package.json index 05cbc0637be..f11c0e5a96d 100644 --- a/packages/builders/package.json +++ b/packages/builders/package.json @@ -44,7 +44,6 @@ }, "devDependencies": { "@agoric/assert": "^0.6.0", - "@agoric/cosmic-swingset": "^0.41.3", "@agoric/deploy-script-support": "^0.10.3", "@agoric/governance": "^0.10.3", "@agoric/inter-protocol": "^0.16.1", diff --git a/packages/cosmic-swingset/package.json b/packages/cosmic-swingset/package.json index cf896a92cac..ea7f7600d72 100644 --- a/packages/cosmic-swingset/package.json +++ b/packages/cosmic-swingset/package.json @@ -50,6 +50,9 @@ "ava": "^5.3.0", "c8": "^7.13.0" }, + "peerDependencies": { + "@agoric/builders": "^0.1.0" + }, "publishConfig": { "access": "public" }, From c7380a79decf5e58b7ed910aef74dbdca48fd3ca Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Mon, 14 Aug 2023 10:10:05 -0400 Subject: [PATCH 2/2] test: move start-local-chain to agoric-cli MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …the one package that uses it. Eventually we'll get replace this bash script with more flexible tooling --- packages/agoric-cli/package.json | 1 + packages/agoric-cli/test/agops-governance-smoketest.sh | 2 +- packages/agoric-cli/test/agops-oracle-smoketest.sh | 2 +- packages/agoric-cli/test/agops-perf-smoketest.sh | 2 +- packages/agoric-cli/test/agops-vaults-smoketest.sh | 2 +- .../inter-protocol => agoric-cli/test}/start-local-chain.sh | 0 .../test/upgrade-contract/contract-upgrade-smoketest.sh | 2 +- 7 files changed, 6 insertions(+), 5 deletions(-) rename packages/{builders/scripts/inter-protocol => agoric-cli/test}/start-local-chain.sh (100%) diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json index 593f129dae6..df83483c8e4 100644 --- a/packages/agoric-cli/package.json +++ b/packages/agoric-cli/package.json @@ -29,6 +29,7 @@ }, "devDependencies": { "@agoric/deploy-script-support": "^0.10.3", + "@agoric/cosmic-swingset": "^0.41.3", "ava": "^5.3.0", "c8": "^7.13.0" }, diff --git a/packages/agoric-cli/test/agops-governance-smoketest.sh b/packages/agoric-cli/test/agops-governance-smoketest.sh index 875cc5bc5fc..b0eb943fd80 100644 --- a/packages/agoric-cli/test/agops-governance-smoketest.sh +++ b/packages/agoric-cli/test/agops-governance-smoketest.sh @@ -10,7 +10,7 @@ if [ -z "$AGORIC_NET" ]; then yarn install && yarn build # local chain running with wallet provisioned -packages/builders/scripts/inter-protocol/start-local-chain.sh +packages/agoric-cli/test/start-local-chain.sh " exit 1 fi diff --git a/packages/agoric-cli/test/agops-oracle-smoketest.sh b/packages/agoric-cli/test/agops-oracle-smoketest.sh index 0287e4f9c4a..ca3f3b15d3f 100755 --- a/packages/agoric-cli/test/agops-oracle-smoketest.sh +++ b/packages/agoric-cli/test/agops-oracle-smoketest.sh @@ -13,7 +13,7 @@ if [ -z "$AGORIC_NET" ]; then yarn install && yarn build # local chain running with wallet provisioned -packages/builders/scripts/inter-protocol/start-local-chain.sh +packages/agoric-cli/test/start-local-chain.sh " exit 1 fi diff --git a/packages/agoric-cli/test/agops-perf-smoketest.sh b/packages/agoric-cli/test/agops-perf-smoketest.sh index 7d65737a921..d71456ab0d4 100755 --- a/packages/agoric-cli/test/agops-perf-smoketest.sh +++ b/packages/agoric-cli/test/agops-perf-smoketest.sh @@ -10,7 +10,7 @@ if [ -z "$AGORIC_NET" ]; then yarn install && yarn build # local chain running with wallet provisioned -packages/builders/scripts/inter-protocol/start-local-chain.sh +packages/agoric-cli/test/start-local-chain.sh " exit 1 fi diff --git a/packages/agoric-cli/test/agops-vaults-smoketest.sh b/packages/agoric-cli/test/agops-vaults-smoketest.sh index 9bd4fb6f0c4..78cd99e057b 100644 --- a/packages/agoric-cli/test/agops-vaults-smoketest.sh +++ b/packages/agoric-cli/test/agops-vaults-smoketest.sh @@ -10,7 +10,7 @@ if [ -z "$AGORIC_NET" ]; then yarn install && yarn build # local chain running with wallet provisioned -packages/builders/scripts/inter-protocol/start-local-chain.sh +packages/agoric-cli/test/start-local-chain.sh " exit 1 fi diff --git a/packages/builders/scripts/inter-protocol/start-local-chain.sh b/packages/agoric-cli/test/start-local-chain.sh similarity index 100% rename from packages/builders/scripts/inter-protocol/start-local-chain.sh rename to packages/agoric-cli/test/start-local-chain.sh diff --git a/packages/agoric-cli/test/upgrade-contract/contract-upgrade-smoketest.sh b/packages/agoric-cli/test/upgrade-contract/contract-upgrade-smoketest.sh index 5c965d63925..32d1e547ad7 100755 --- a/packages/agoric-cli/test/upgrade-contract/contract-upgrade-smoketest.sh +++ b/packages/agoric-cli/test/upgrade-contract/contract-upgrade-smoketest.sh @@ -10,7 +10,7 @@ if [ -z "$AGORIC_NET" ]; then yarn install && yarn build # local chain running with wallet provisioned -packages/builders/scripts/inter-protocol/start-local-chain.sh +packages/agoric-cli/test/start-local-chain.sh " exit 1 fi