Merge branch 'main' into feat-besu-connector-get-transaction

hyperledger-cacti · Jun 21, 2021 · 6e6b203 · 6e6b203
2 parents 0f1e1f3 + 183ce86
commit 6e6b203
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 1 deletion.
diff --git a/...chain-backend/src/main/typescript/infrastructure/supply-chain-app-dummy-infrastructure.ts b/...chain-backend/src/main/typescript/infrastructure/supply-chain-app-dummy-infrastructure.ts
@@ -109,6 +109,7 @@ export class SupplyChainAppDummyInfrastructure {
       publishAllPorts: true,
       imageName: "hyperledger/cactus-fabric-all-in-one",
       imageVersion: "2021-03-02-ssh-hotfix",
+      logLevel: level,
     });
 
     if (this.options.keychain) {

diff --git a/...us-example-supply-chain-frontend/src/app/shipment/shipment-detail/shipment-detail.page.ts b/...us-example-supply-chain-frontend/src/app/shipment/shipment-detail/shipment-detail.page.ts
@@ -46,7 +46,7 @@ export class ShipmentDetailPage implements OnInit {
     }
   }
 
-  async ngOnInit() {
+  async ngOnInit(): Promise<void> {
     this.log.debug("component initialized.", this.shipment);
 
     this._supplyChainApi = await this.baseClient.ofLedger(

diff --git a/...fabric/src/test/typescript/integration/fabric-v1-4-x/deploy-cc-from-golang-source.test.ts b/...fabric/src/test/typescript/integration/fabric-v1-4-x/deploy-cc-from-golang-source.test.ts
@@ -55,6 +55,7 @@ test(testCase, async (t: Test) => {
   });
   const ledger = new FabricTestLedgerV1({
     emitContainerLogs: true,
+    logLevel,
     publishAllPorts: true,
     // imageName: "faio14x",
     // imageVersion: "latest",
@@ -179,8 +180,26 @@ test(testCase, async (t: Test) => {
     moduleName: "hello-world",
     targetOrganizations: [org1Env, org2Env],
     pinnedDeps: [
+      "github.com/Knetic/[email protected]+incompatible",
+      "github.com/Shopify/[email protected]",
+      "github.com/fsouza/[email protected]",
+      "github.com/grpc-ecosystem/[email protected]",
+      "github.com/hashicorp/[email protected]",
       "github.com/hyperledger/[email protected]",
+      "github.com/hyperledger/[email protected]",
+      "github.com/miekg/[email protected]",
+      "github.com/mitchellh/[email protected]",
+      "github.com/onsi/[email protected]",
+      "github.com/onsi/[email protected]",
+      "github.com/op/[email protected]",
+      "github.com/pkg/[email protected]",
+      "github.com/spf13/[email protected]",
+      "github.com/stretchr/[email protected]",
+      "github.com/sykesm/[email protected]",
+      "go.uber.org/[email protected]",
+      "golang.org/x/[email protected]",
       "golang.org/x/[email protected]",
+      "google.golang.org/[email protected]",
     ],
   });
 

diff --git a/...st/typescript/integration/fabric-v2-2-x/deploy-cc-from-golang-source-private-data.test.ts b/...st/typescript/integration/fabric-v2-2-x/deploy-cc-from-golang-source-private-data.test.ts
@@ -61,6 +61,7 @@ test(testCase, async (t: Test) => {
     imageName: "hyperledger/cactus-fabric2-all-in-one",
     imageVersion: "2021-04-20-nodejs",
     envVars: new Map([["FABRIC_VERSION", "2.2.0"]]),
+    logLevel,
   });
   const tearDown = async () => {
     await ledger.stop();

diff --git a/...fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-golang-source.test.ts b/...fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-golang-source.test.ts
@@ -63,6 +63,7 @@ test(testCase, async (t: Test) => {
     imageName: "hyperledger/cactus-fabric2-all-in-one",
     imageVersion: "2021-04-20-nodejs",
     envVars: new Map([["FABRIC_VERSION", "2.2.0"]]),
+    logLevel,
   });
 
   const tearDown = async () => {

diff --git a/...ic/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-javascript-source.test.ts b/...ic/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-javascript-source.test.ts
@@ -64,6 +64,7 @@ test(testCase, async (t: Test) => {
     imageName: "hyperledger/cactus-fabric2-all-in-one",
     imageVersion: "2021-04-20-nodejs",
     envVars: new Map([["FABRIC_VERSION", "2.2.0"]]),
+    logLevel,
   });
   const tearDown = async () => {
     await ledger.stop();

diff --git a/...ic/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-typescript-source.test.ts b/...ic/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-typescript-source.test.ts
@@ -64,6 +64,7 @@ test(testCase, async (t: Test) => {
     imageName: "hyperledger/cactus-fabric2-all-in-one",
     imageVersion: "2021-04-20-nodejs",
     envVars: new Map([["FABRIC_VERSION", "2.2.0"]]),
+    logLevel,
   });
   const tearDown = async () => {
     await ledger.stop();