Merge branch 'main' into improvements-to-build-and-test

TezosTaqueria · Nov 22, 2022 · a7c8e26 · a7c8e26
2 parents 6db521b + 74e76d0
commit a7c8e26
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/taqueria-vscode-extension/CHANGELOG.md b/taqueria-vscode-extension/CHANGELOG.md
@@ -1269,3 +1269,4 @@ Specifically:
     - SmartPy
     - Taquito
     - Flextesa
+
diff --git a/tests/README.md b/tests/README.md
@@ -19,6 +19,9 @@ $ npm install -w taqueria-plugin-mock
 $ npm install -w tests
 ```
 
+### Building Taqueria for Testing:
+A few things need to be built for the tests to run correctly since they make use of Taqueria internal functionality. This is all handled with a single command `npm run build-all`. Once this is command completes you will be able to run the tests that make sure Taqueria is working the way we expect it to work.
+
 ### Running the Tests:
 - The tests should be run from the taqueria root folder by calling the test run script with the workspace specified: `npm run test:{unit|integration|e2e} -w tests`
     - If you're going to be running the unit tests then you will need deno installed on your system
diff --git a/website/docs/scaffolds/taco-shop.mdx b/website/docs/scaffolds/taco-shop.mdx
@@ -202,7 +202,7 @@ This will be fixed in the future when contract addresses will be passed via the
 ### Insert the Contract Address
 
 There is a way to point the dApp to a hardcoded contract.
-To do so you need to insert the address of the contract into the `/app/src/App.tsx` file. Copy the address returned from the command above and paste it into the `contractAddress` variable in the `/app/src/App.tsx` file as shown here:
+To do so you need to insert the address of the contract into the `/app/src/App.tsx` file. Copy the address returned from the command above and paste it into the `contractAddress` variable in the `/app/src/App.tsx` file as shown here, replacing `getAliasAddress(config, "hello-tacos")` with the contract address:
 
 ```ts /app/src/App.tsx
 function App() {
@@ -212,7 +212,6 @@ function App() {
   const [rpcUrl] = useState("https://ghostnet.ecadinfra.com");
   const [contractAddress] = useState(
     "KT1KBBk3PXkKmGZn3K6FkktqyPRpEbzJoEPE"
-    getAliasAddress(config, "hello-tacos")
   );
   const [contractStorage, setContractStorage] = useState<Storage | undefined>(
     undefined
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1269,3 +1269,4 @@ Specifically:
		- SmartPy
		- Taquito
		- Flextesa