Merge branch 'origin/DenialServiceMime' of https://github.com/micofer…

…dinand98/cactus into origin/DenialServiceMime

.dcilintignore

@@ -11,7 +11,7 @@ docs/source/conf.py
 examples/register-indy-data/req_discounted_cartrade.py
 
 # Cannot be edited due to configuration schema of third party software
-tools/docker/indy-testnet/indy_pool/indy-pool.dockerfile
+tools/docker/indy-testnet/Dockerfile
 
 # Cannot be edited due to configuration schema of third party software
 packages/cactus-test-tooling/src/main/typescript/keycloak/keycloak-container.ts

.eslintignore

@@ -1,19 +1,4 @@
-
-# !packages/cactus-*/**
-# !examples/cactus-*/**
-
-# examples/cartrade/
-# packages/business-logic-plugin/
-# packages/ledger-plugin/
-# packages/routing-interface/
-# packages/config/
-
 **/dist/**
-# **/node_modules/**
-# **/build/**
-# **/coverage/**
-
-# typings/**
 
 **/src/main/typescript/generated/proto/**
 **/src/main/typescript/generated/wasm-pack/**

.gitignore

@@ -61,4 +61,3 @@ site/
 !packages/cactus-plugin-verifier-cc/src/main/typescript/ledger-plugin/*/validator/src/core/bin
 
 tools/docker/geth-testnet/data-geth1/
-examples/cactus-example-verifier-cc-cartrade/src/main/typescript/impl/script-test-getFunctions/fabric/wallet/

.taprc

@@ -6,7 +6,6 @@ timeout: 900
 ts: true
 files:
   - ./packages/cactus-plugin-keychain-aws-sm/src/test/typescript/integration/openapi/openapi-validation.test.ts
-  - ./packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap/transfer-complete.test.ts
   - ./packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap/odap-api-call.test.ts
   - ./packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap/odap-api-call-with-ledger-connector.test.ts
   - ./packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap/lock-evidence.test.ts

.vscode/template.launch.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.0",
+  "version": "0.2.1",
   "configurations": [
     {
       "type": "node",
@@ -11,7 +11,11 @@
         "${relativeFile}"
       ],
       "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen"
+      "internalConsoleOptions": "neverOpen",
+      "outFiles": [
+        "${workspaceFolder}/**/*.js",
+        "!**/node_modules/**"
+      ]
     },
     {
       "name": "TAP: Current TS Test File",
@@ -30,7 +34,11 @@
       ],
       "console": "integratedTerminal",
       "sourceMaps": true,
-      "cwd": "${workspaceRoot}"
+      "cwd": "${workspaceRoot}",
+      "outFiles": [
+        "${workspaceFolder}/**/*.js",
+        "!**/node_modules/**"
+      ]
     },
     {
       "name": "Example: Supply Chain App",
@@ -52,7 +60,11 @@
       ],
       "console": "integratedTerminal",
       "sourceMaps": true,
-      "cwd": "${workspaceFolder}/examples/supply-chain-app/"
+      "cwd": "${workspaceFolder}/examples/supply-chain-app/",
+      "outFiles": [
+        "${workspaceFolder}/**/*.js",
+        "!**/node_modules/**"
+      ]
     }
   ]
 }

BUILD.md

@@ -96,8 +96,9 @@ The `npm run watch` script in action:
     ```
   * Yarn 
     * `npm run install-yarn` (from within the project directory)
-  * Docker Engine
-  * Docker Compose
+  * [Docker Engine](https://docs.docker.com/engine/install/ubuntu/). Make sure that Docker is working and running, for example, running ``docker ps -aq``  
+  * Docker Compose  
+
   * OpenJDK (Corda support Java 8 JDK but do not currently support Java 9 or higher)
     * `sudo apt install openjdk-8-jdk-headless`
 
@@ -124,7 +125,7 @@ cd cactus
 * Run the initial configuration script (can take a long time, 10+ minutes on a low-spec laptop)
 
 ```sh
-npm run configure
+yarn run configure
 ```
 
 At this point you should have all packages built for development.
@@ -212,7 +213,7 @@ the following decision tree (and keep in mind that we have `npm run watch` too)
 
 ![Build Script Decision Tree](./docs/images/build-script-decision-tree-2021-03-06.png)
 
-## Getting into the SSH connection
+## Configuring SSH to use upterm
 Upload your public key onto github if not done so already. A public key is necessary to join the ssh connection to use upterm. For a comprehensive guide, see the [Generating a new SSH key and adding it to the ssh-agent](https://docs.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent).
 
 Locate the `ci.yml` within `.github/workflows` and add to the `ci.yml` code listed below: 

CONTRIBUTING.md

@@ -367,6 +367,8 @@ for both them separately anyway:
       npx jest packages/cactus-common/src/test/typescript/unit/objects/get-all-method-names.test.ts
       ```
 
+      You can also run tests via the VS Code user interface. To do so, make sure you rename ``template.launch.json`` to ``launch.json`. Under the "Run and Debug" window of VS Code, select "JEST: Current TS file" to test the currently opened file.
+
 #### Running all test cases (unit+integration)
 
 ```sh

README.md

@@ -40,9 +40,9 @@ As blockchain technology proliferates, blockchain integration will become an inc
 
 Once the last command has finished executing, open link printed on the console with a web browser of your choice
 
-### Car Trade Example
+### Discounted Car Trade Example
 
-- The guidance is [here](./examples/cartrade/README.md).
+- The guidance is [here](./examples/discounted-cartrade/README.md).
 
 ### Electricity Trade Example