Merge branch 'main' into api-surface-tests-three

hyperledger-cacti · Jun 21, 2021 · f8e491c · f8e491c
2 parents 3c30acc + 183ce86
commit f8e491c
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/govaluate@v3.0.0+incompatible",
+      "github.com/Shopify/sarama@v1.27.0",
+      "github.com/fsouza/go-dockerclient@v1.6.5",
+      "github.com/grpc-ecosystem/go-grpc-middleware@v1.2.1",
+      "github.com/hashicorp/go-version@v1.2.1",
       "github.com/hyperledger/fabric@v1.4.8",
+      "github.com/hyperledger/fabric-amcl@v0.0.0-20200424173818-327c9e2cf77a",
+      "github.com/miekg/pkcs11@v1.0.3",
+      "github.com/mitchellh/mapstructure@v1.3.3",
+      "github.com/onsi/ginkgo@v1.14.1",
+      "github.com/onsi/gomega@v1.10.2",
+      "github.com/op/go-logging@v0.0.0-20160315200505-970db520ece7",
+      "github.com/pkg/errors@v0.9.1",
+      "github.com/spf13/viper@v1.7.1",
+      "github.com/stretchr/testify@v1.6.1",
+      "github.com/sykesm/zap-logfmt@v0.0.3",
+      "go.uber.org/zap@v1.16.0",
+      "golang.org/x/crypto@v0.0.0-20200820211705-5c72a883971a",
       "golang.org/x/net@v0.0.0-20210503060351-7fd8e65b6420",
+      "google.golang.org/grpc@v1.31.1",
     ],
   });
 

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();