Use separate testable package names instead of tags

Synthetixio · Aug 15, 2023 · d731f78 · d731f78
1 parent d0ce1ce
commit d731f78
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 deletions.
diff --git a/markets/perps-market/cannonfile.test.toml b/markets/perps-market/cannonfile.test.toml
@@ -1,5 +1,5 @@
-name = "synthetix-perps-market"
-version = "<%= package.version %>-testable"
+name = "synthetix-perps-market-testable"
+version = "<%= package.version %>"
 description = "Perps market implementation"
 
 [setting.coreProxyOwner]
@@ -11,10 +11,10 @@ description = "perps market owner"
 defaultValue = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 
 [setting.synthetixPackage]
-defaultValue = "synthetix:<%= package.version %>-testable"
+defaultValue = "synthetix-testable:<%= package.version %>"
 
 [setting.spotMarketPackage]
-defaultValue = "synthetix-spot-market:<%= package.version %>-testable"
+defaultValue = "synthetix-spot-market-testable:<%= package.version %>"
 
 [import.synthetix]
 source = "<%= settings.synthetixPackage %>"

diff --git a/markets/perps-market/package.json b/markets/perps-market/package.json
@@ -15,7 +15,7 @@
     "coverage1": "hardhat coverage --network hardhat",
     "compile-contracts": "hardhat compile",
     "publish-contracts": "yarn build && cannon publish synthetix-perps-market:$(node -p 'require(`./package.json`).version') --quiet",
-    "publish-testable": "yarn build-testable && cannon publish synthetix-perps-market:$(node -p 'require(`./package.json`).version')-testable --quiet",
+    "publish-testable": "yarn build-testable && cannon publish synthetix-perps-market-testable:$(node -p 'require(`./package.json`).version') --quiet",
     "size-contracts": "hardhat compile && hardhat size-contracts",
     "postpack": "yarn publish-contracts && yarn publish-testable",
     "docgen": "hardhat docgen"

diff --git a/markets/spot-market/cannonfile.test.toml b/markets/spot-market/cannonfile.test.toml
@@ -1,5 +1,5 @@
-name = "synthetix-spot-market"
-version = "<%= package.version %>-testable"
+name = "synthetix-spot-market-testable"
+version = "<%= package.version %>"
 description = "Spot market implementation"
 
 [setting.coreProxyOwner]
@@ -11,7 +11,7 @@ description = "spot market owner"
 defaultValue = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 
 [setting.synthetixPackage]
-defaultValue = "synthetix:<%= package.version %>-testable"
+defaultValue = "synthetix-testable:<%= package.version %>"
 
 [import.synthetix]
 source = "<%= settings.synthetixPackage %>"

diff --git a/markets/spot-market/package.json b/markets/spot-market/package.json
@@ -16,7 +16,7 @@
     "coverage1": "hardhat coverage --network hardhat",
     "compile-contracts": "hardhat compile",
     "publish-contracts": "yarn build && cannon publish synthetix-spot-market:$(node -p 'require(`./package.json`).version') --quiet",
-    "publish-testable": "yarn build-testable && cannon publish synthetix-spot-market:$(node -p 'require(`./package.json`).version')-testable --quiet",
+    "publish-testable": "yarn build-testable && cannon publish synthetix-spot-market-testable:$(node -p 'require(`./package.json`).version') --quiet",
     "size-contracts": "hardhat compile && hardhat size-contracts",
     "postpack": "yarn publish-contracts && yarn publish-testable",
     "docgen": "hardhat docgen"

diff --git a/protocol/oracle-manager/cannonfile.test.toml b/protocol/oracle-manager/cannonfile.test.toml
@@ -1,4 +1,5 @@
-version = "<%= package.version %>-testable"
+name = "oracle-manager-testable"
+version = "<%= package.version %>"
 
 include = [
   "cannonfile.toml"

diff --git a/protocol/oracle-manager/package.json b/protocol/oracle-manager/package.json
@@ -16,7 +16,7 @@
     "compile-contracts": "hardhat compile",
     "size-contracts": "hardhat compile && hardhat size-contracts",
     "publish-contracts": "yarn build && cannon publish oracle-manager:$(node -p 'require(`./package.json`).version') --quiet",
-    "publish-testable": "yarn build-testable && cannon publish oracle-manager:$(node -p 'require(`./package.json`).version')-testable --quiet",
+    "publish-testable": "yarn build-testable && cannon publish oracle-manager-testable:$(node -p 'require(`./package.json`).version') --quiet",
     "postpack": "yarn publish-contracts",
     "docgen": "hardhat docgen"
   },

diff --git a/protocol/synthetix/cannonfile.test.toml b/protocol/synthetix/cannonfile.test.toml
@@ -1,6 +1,7 @@
 # overrides to create a testable deployment of the core system
 
-version = "<%= package.version %>-testable"
+name = "synthetix-testable"
+version = "<%= package.version %>"
 
 include = [
   "cannonfile.toml"
@@ -166,4 +167,4 @@ args = [[
   "0x7d632bd2<%= defaultAbiCoder.encode(['bytes32', 'bool'], [formatBytes32String('createPool'), true]).slice(2) %>",
 ]]
 
-depends = ["invoke.upgrade_core_proxy"]
+depends = ["invoke.upgrade_core_proxy"]
diff --git a/protocol/synthetix/package.json b/protocol/synthetix/package.json
@@ -17,7 +17,7 @@
     "compile-contracts": "hardhat compile",
     "size-contracts": "hardhat compile && hardhat size-contracts",
     "publish-contracts": "yarn build && cannon publish synthetix:$(node -p 'require(`./package.json`).version') --quiet",
-    "publish-testable": "yarn build-testable && cannon publish synthetix:$(node -p 'require(`./package.json`).version')-testable --quiet",
+    "publish-testable": "yarn build-testable && cannon publish synthetix-testable:$(node -p 'require(`./package.json`).version') --quiet",
     "postpack": "yarn publish-contracts && yarn publish-testable",
     "docgen": "hardhat docgen"
   },