Pre-merge code cleanup

src/dlt/gateway/Dockerfile

@@ -38,11 +38,8 @@ COPY src/dlt/gateway/dltApp/src/ ./src
 # Install dependencies
 RUN npm install
 
-
-
 # Expose the port that the gRPC service runs on
 EXPOSE 50051
 
 # Command to run the service
 CMD ["node", "src/dltGateway.js"]
-#CMD ["sh", "-c", "sleep 3600"]  # Keep the container running for testing

src/dlt/gateway/README.md

@@ -2,9 +2,15 @@
 
 ## Description
 
-The DLT Gateway consists of a **fabricConnect.ts** TypeScript file, which contains the logic for identification management (certificates required for the MSP), connection management to the blockchain, and finally, it exposes a contract object with all the required information for interacting with the chaincode. The **fabricConnect.ts** is coded following the Fabric Gateway API recommendations from Hyperledger Fabric 2.4+. The compiled **fabricConnect.ts** logic is imported into a **dltGateway.js** file, which contains the gRPC logic for interaction with the TFS controller. Testing code for various performance tests is included inside the [/tests](./tests/) folder.
+The DLT Gateway consists of a **fabricConnect.ts** TypeScript file, which contains the logic for identification
+management (certificates required for the MSP), connection management to the blockchain, and finally, it exposes a
+contract object with all the required information for interacting with the chaincode. The **fabricConnect.ts** is
+coded following the Fabric Gateway API recommendations from Hyperledger Fabric 2.4+. The compiled **fabricConnect.ts**
+logic is imported into a **dltGateway.js** file, which contains the gRPC logic for interaction with the TFS controller.
+Testing code for various performance tests is included inside the [/tests](./tests/) folder.
 
-The chaincode is written in Go, providing a reference for the operations that are recorded in the blockchain. This chaincode must already be deployed in a working Hyperledger Fabric blockchain.
+The chaincode is written in Go, providing a reference for the operations that are recorded in the blockchain. This
+chaincode must already be deployed in a working Hyperledger Fabric blockchain.
 
 ## Requisites
 
@@ -12,16 +18,18 @@ The chaincode is written in Go, providing a reference for the operations that ar
 * Docker
 * Kubernetes (K8s)
  
-Sign and TLS certificates, and private key of the MSP user from the Hyperledger Fabric deployment must be copied to the [/keys](./keys/) directory inside this repository.
-
-  Example:
-  
-  ```bash
-  cp ~/fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt src/dlt/gateway/keys/
-  
-  cp ~/fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem src/dlt/gateway/keys/cert.pem
-  
-  cp ~/fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/priv_sk src/dlt/gateway/keys/
-  ```
-
-These files are essential for establishing the identity and secure connection to the blockchain. Make sure you replace the paths with your actual file locations from your Hyperledger Fabric deployment.
+Sign and TLS certificates, and private key of the MSP user from the Hyperledger Fabric deployment must be copied to the
+[/keys](./keys/) directory inside this repository.
+
+Example:
+
+```bash
+cp ~/fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt src/dlt/gateway/keys/
+
+cp ~/fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem src/dlt/gateway/keys/cert.pem
+
+cp ~/fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/priv_sk src/dlt/gateway/keys/
+```
+
+These files are essential for establishing the identity and secure connection to the blockchain. Make sure you replace
+the paths with your actual file locations from your Hyperledger Fabric deployment.

src/dlt/gateway/dltApp/package.json

@@ -16,7 +16,7 @@
         "start": "node dist/dlt_gateway.js"
     },
     "engineStrict": true,
-    "author": "CTTC-Javier",
+    "author": "Javier Jose Diaz (CTTC)",
     "license": "Apache-2.0",
     "dependencies": {
         "@grpc/grpc-js": "^1.10.8",

src/dlt/gateway/keys/.gitignore

 ca.crt
 cert.pem
-priv_sk
\ No newline at end of file
+priv_sk

src/dlt/gateway/samples/sampleTopo.json

@@ -27,4 +27,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}

src/dlt/gateway/samples/updatedTopo.json

@@ -14,4 +14,4 @@
             "connections": ["node1"]
         }
     ]
-}
\ No newline at end of file
+}

src/dlt/gateway/tests/testEvents.js

@@ -28,7 +28,7 @@ const packageDefinition = protoLoader.loadSync(PROTO_PATH, {
 const dltProto = grpc.loadPackageDefinition(packageDefinition).dlt;
 
 const client = new dltProto.DltGatewayService(
-  '10.1.1.96:32001', //Replace with TFS server IP_ADDRESS
+  '127.0.0.1:32001', // Replace with TFS server IP_ADDRESS
   grpc.credentials.createInsecure()
 );
 

src/dlt/gateway/tests/testGateway.js

@@ -31,7 +31,7 @@ const packageDefinition = protoLoader.loadSync(PROTO_PATH, {
 const dltProto = grpc.loadPackageDefinition(packageDefinition).dlt;
 
 const client = new dltProto.DltGatewayService(
-    '10.1.1.96:32001',
+    '127.0.0.1:32001', // Replace with TFS server IP_ADDRESS
     grpc.credentials.createInsecure()
 );