up go 1.22.3

Signed-off-by: Fedor Partanskiy <fredprtnsk@gmail.com>
pfi79 · May 16, 2024 · fb82cff · fb82cff
1 parent 71cda03
commit fb82cff
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 21 deletions.
diff --git a/.github/workflows/broken-link-checker.yml b/.github/workflows/broken-link-checker.yml
@@ -13,7 +13,7 @@ on:
       - .github/workflows/broken-link-checker.yml
 
 env:
-  GO_VER: 1.21.9
+  GO_VER: 1.22.3
 
 permissions:
   contents: read

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ on:
       - v3.*
 
 env:
-  GO_VER: 1.21.9
+  GO_VER: 1.22.3
   UBUNTU_VER: 20.04
   FABRIC_VER: ${{ github.ref_name }}
   DOCKER_REGISTRY: ${{ github.repository_owner == 'hyperledger' && 'docker.io' || 'ghcr.io' }}

diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
@@ -13,7 +13,7 @@ on:
 env:
   GOPATH: /opt/go
   PATH: /opt/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-  GO_VER: 1.21.9
+  GO_VER: 1.22.3
 
 permissions:
   contents: read # to fetch code (actions/checkout)
@@ -67,3 +67,25 @@ jobs:
         name: Install SoftHSM
       - run: make integration-test INTEGRATION_TEST_SUITE="${{matrix.INTEGRATION_TEST_SUITE}}"
         name: Run Integration Tests
+  pfi-tests:
+    name: PFI Tests
+    needs: basic-checks
+    runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
+    env:
+      GORACE: atexit_sleep_ms=0
+    steps:
+      - uses: actions/checkout@v4
+        name: Checkout Fabric Code
+      - uses: actions/setup-go@v5
+        name: Install Go
+        with:
+          go-version: ${{ env.GO_VER }}
+      - run: ci/scripts/setup_hsm.sh
+        name: Install SoftHSM
+      - run: env
+        name: PFI env
+#      - run:  go test github.com/hyperledger/fabric/core/handlers/library
+#        name: Run PFI Tests
+      - run: go test -cover -race -failfast -tags '' github.com/hyperledger/fabric/cmd/common github.com/hyperledger/fabric/cmd/common/comm github.com/hyperledger/fabric/cmd/common/signer github.com/hyperledger/fabric/cmd/configtxgen github.com/hyperledger/fabric/cmd/configtxlator github.com/hyperledger/fabric/cmd/cryptogen github.com/hyperledger/fabric/cmd/discover github.com/hyperledger/fabric/cmd/ledgerutil github.com/hyperledger/fabric/cmd/orderer github.com/hyperledger/fabric/cmd/osnadmin github.com/hyperledger/fabric/cmd/osnadmin/mocks github.com/hyperledger/fabric/cmd/peer github.com/hyperledger/fabric/common/capabilities github.com/hyperledger/fabric/common/cauthdsl github.com/hyperledger/fabric/common/chaincode github.com/hyperledger/fabric/common/channelconfig github.com/hyperledger/fabric/common/configtx github.com/hyperledger/fabric/common/configtx/mock github.com/hyperledger/fabric/common/configtx/test github.com/hyperledger/fabric/common/crypto github.com/hyperledger/fabric/common/crypto/tlsgen github.com/hyperledger/fabric/common/deliver github.com/hyperledger/fabric/common/deliver/mock github.com/hyperledger/fabric/common/deliverclient github.com/hyperledger/fabric/common/deliverclient/blocksprovider github.com/hyperledger/fabric/common/deliverclient/blocksprovider/fake github.com/hyperledger/fabric/common/deliverclient/orderers github.com/hyperledger/fabric/common/diag github.com/hyperledger/fabric/common/errors github.com/hyperledger/fabric/common/fabhttp github.com/hyperledger/fabric/common/fabhttp/fakes github.com/hyperledger/fabric/common/genesis github.com/hyperledger/fabric/common/graph github.com/hyperledger/fabric/common/grpclogging github.com/hyperledger/fabric/common/grpclogging/fakes github.com/hyperledger/fabric/common/grpclogging/testpb github.com/hyperledger/fabric/common/grpcmetrics github.com/hyperledger/fabric/common/grpcmetrics/fakes github.com/hyperledger/fabric/common/grpcmetrics/testpb github.com/hyperledger/fabric/common/ledger github.com/hyperledger/fabric/common/ledger/blkstorage github.com/hyperledger/fabric/common/ledger/blkstorage/blkstoragetest github.com/hyperledger/fabric/common/ledger/blockledger github.com/hyperledger/fabric/common/ledger/blockledger/fileledger github.com/hyperledger/fabric/common/ledger/blockledger/fileledger/mock github.com/hyperledger/fabric/common/ledger/dataformat github.com/hyperledger/fabric/common/ledger/snapshot github.com/hyperledger/fabric/common/ledger/testutil github.com/hyperledger/fabric/common/ledger/testutil/fakes github.com/hyperledger/fabric/common/ledger/util github.com/hyperledger/fabric/common/ledger/util/leveldbhelper github.com/hyperledger/fabric/common/metadata github.com/hyperledger/fabric/common/policies github.com/hyperledger/fabric/common/policies/inquire github.com/hyperledger/fabric/common/policies/mocks github.com/hyperledger/fabric/common/policydsl github.com/hyperledger/fabric/common/semaphore github.com/hyperledger/fabric/common/util github.com/hyperledger/fabric/common/viperutil github.com/hyperledger/fabric/core/aclmgmt github.com/hyperledger/fabric/core/aclmgmt/mocks github.com/hyperledger/fabric/core/aclmgmt/resources github.com/hyperledger/fabric/core/cclifecycle github.com/hyperledger/fabric/core/cclifecycle/mocks github.com/hyperledger/fabric/core/chaincode github.com/hyperledger/fabric/core/chaincode/accesscontrol github.com/hyperledger/fabric/core/chaincode/extcc github.com/hyperledger/fabric/core/chaincode/extcc/mock github.com/hyperledger/fabric/core/chaincode/fake github.com/hyperledger/fabric/core/chaincode/implicitcollection github.com/hyperledger/fabric/core/chaincode/lifecycle github.com/hyperledger/fabric/core/chaincode/lifecycle/mock github.com/hyperledger/fabric/core/chaincode/mock github.com/hyperledger/fabric/core/chaincode/persistence github.com/hyperledger/fabric/core/chaincode/persistence/mock github.com/hyperledger/fabric/core/chaincode/platforms github.com/hyperledger/fabric/core/chaincode/platforms/golang github.com/hyperledger/fabric/core/chaincode/platforms/java github.com/hyperledger/fabric/core/chaincode/platforms/mock github.com/hyperledger/fabric/core/chaincode/platforms/node github.com/hyperledger/fabric/core/chaincode/platforms/util github.com/hyperledger/fabric/core/committer github.com/hyperledger/fabric/core/committer/txvalidator github.com/hyperledger/fabric/core/committer/txvalidator/mocks github.com/hyperledger/fabric/core/committer/txvalidator/plugin github.com/hyperledger/fabric/core/committer/txvalidator/v14 github.com/hyperledger/fabric/core/committer/txvalidator/v14/mocks github.com/hyperledger/fabric/core/committer/txvalidator/v20 github.com/hyperledger/fabric/core/committer/txvalidator/v20/mocks github.com/hyperledger/fabric/core/committer/txvalidator/v20/plugindispatcher github.com/hyperledger/fabric/core/committer/txvalidator/v20/plugindispatcher/mocks github.com/hyperledger/fabric/core/committer/txvalidator/v20/valinforetriever github.com/hyperledger/fabric/core/committer/txvalidator/v20/valinforetriever/mocks github.com/hyperledger/fabric/core/common/ccpackage github.com/hyperledger/fabric/core/common/ccprovider github.com/hyperledger/fabric/core/common/privdata github.com/hyperledger/fabric/core/common/privdata/mock github.com/hyperledger/fabric/core/common/sysccprovider github.com/hyperledger/fabric/core/common/validation github.com/hyperledger/fabric/core/common/validation/statebased github.com/hyperledger/fabric/core/common/validation/statebased/mocks github.com/hyperledger/fabric/core/config github.com/hyperledger/fabric/core/config/configtest github.com/hyperledger/fabric/core/container github.com/hyperledger/fabric/core/container/ccintf github.com/hyperledger/fabric/core/container/dockercontroller github.com/hyperledger/fabric/core/container/dockercontroller/mock github.com/hyperledger/fabric/core/container/externalbuilder github.com/hyperledger/fabric/core/container/mock github.com/hyperledger/fabric/core/deliverservice github.com/hyperledger/fabric/core/deliverservice/fake github.com/hyperledger/fabric/core/dispatcher github.com/hyperledger/fabric/core/dispatcher/mock github.com/hyperledger/fabric/core/endorser github.com/hyperledger/fabric/core/endorser/fake github.com/hyperledger/fabric/core/endorser/mocks github.com/hyperledger/fabric/core/handlers/auth github.com/hyperledger/fabric/core/handlers/auth/filter github.com/hyperledger/fabric/core/handlers/auth/plugin github.com/hyperledger/fabric/core/handlers/decoration github.com/hyperledger/fabric/core/handlers/decoration/decorator github.com/hyperledger/fabric/core/handlers/decoration/plugin github.com/hyperledger/fabric/core/handlers/endorsement/api github.com/hyperledger/fabric/core/handlers/endorsement/api/identities github.com/hyperledger/fabric/core/handlers/endorsement/api/state github.com/hyperledger/fabric/core/handlers/endorsement/builtin github.com/hyperledger/fabric/core/handlers/endorsement/builtin/mocks github.com/hyperledger/fabric/core/handlers/endorsement/plugin github.com/hyperledger/fabric/core/handlers/library -short -p 1 -timeout=20m
+        name: Run PFI Tests1
+
diff --git a/.github/workflows/vulnerability-scan.yml b/.github/workflows/vulnerability-scan.yml
@@ -30,6 +30,6 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.9
+          go-version: 1.22.3
       - name: Scan
         run: make scan
diff --git a/Makefile b/Makefile
@@ -77,7 +77,7 @@ METADATA_VAR += CommitSHA=$(EXTRA_VERSION)
 METADATA_VAR += BaseDockerLabel=$(BASE_DOCKER_LABEL)
 METADATA_VAR += DockerNamespace=$(DOCKER_NS)
 
-GO_VER = 1.21.9
+GO_VER = 1.22.3
 GO_TAGS ?=
 
 RELEASE_EXES = orderer $(TOOLS_EXES)

diff --git a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_sorted.json b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_sorted.json
@@ -1,9 +1,9 @@
 {
   "A": 1,
   "Backslash": "\\",
-  "Backspace": "\u0008",
+  "Backspace": "\b",
   "CarriageReturn": "\r",
-  "FormFeed": "\u000c",
+  "FormFeed": "\f",
   "Newline": "\n",
   "PublicKey": {
     "Curve": {
@@ -28,7 +28,7 @@
       "Args": [
         "deploy",
         "ch1",
-        "\nU\u0008\u0001\u0012I\n=github.com/hyperledger/fabric/examples/chaincode/go/marbles02\u0012\u0005mycc1\u001a\u00010\u001a\u0006\n\u0004init",
+        "\nU\b\u0001\u0012I\n=github.com/hyperledger/fabric/examples/chaincode/go/marbles02\u0012\u0005mycc1\u001a\u00010\u001a\u0006\n\u0004init",
         "",
         "escc",
         "vscc"
@@ -48,7 +48,7 @@
         "writes": [
           {
             "key": "mycc1",
-            "value": "\n\u0005mycc1\u0012\u00010\u001a\u0004escc\"\u0004vscc*\u0017\u0012\u0008\u0012\u0006\u0008\u0001\u0012\u0002\u0008\u0000\u001a\u000b\u0012\t\n\u0007DEFAULT2D\n ��$˞�K݂o�pJ{��_��(\u0015ݮ�\u003e\u001a�c�\tS�\u0012 \u0012V�1\u000e�\u000e��\u0010Q�i�$�VtV\\�\u0018L(�I����F�: E��ؿk�\u003c\u0015�x��F\r�\u0005��C9\u0001�\t�bA\u000e\u0018�5�B\u0019\u0012\u0008\u0012\u0006\u0008\u0001\u0012\u0002\u0008\u0000\u001a\r\u0012\u000b\n\u0007DEFAULT\u0010\u0001"
+            "value": "\n\u0005mycc1\u0012\u00010\u001a\u0004escc\"\u0004vscc*\u0017\u0012\b\u0012\u0006\b\u0001\u0012\u0002\b\u0000\u001a\u000b\u0012\t\n\u0007DEFAULT2D\n ��$˞�K݂o�pJ{��_��(\u0015ݮ�\u003e\u001a�c�\tS�\u0012 \u0012V�1\u000e�\u000e��\u0010Q�i�$�VtV\\�\u0018L(�I����F�: E��ؿk�\u003c\u0015�x��F\r�\u0005��C9\u0001�\t�bA\u000e\u0018�5�B\u0019\u0012\b\u0012\u0006\b\u0001\u0012\u0002\b\u0000\u001a\r\u0012\u000b\n\u0007DEFAULT\u0010\u0001"
           }
         ]
       },

diff --git a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_unsorted.json b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_unsorted.json
@@ -25,8 +25,8 @@
   "Tab": "\t",
   "CarriageReturn": "\r",
   "Newline": "\n",
-  "FormFeed": "\u000c",
-  "Backspace": "\u0008",
+  "FormFeed": "\f",
+  "Backspace": "\b",
   "chaincode_spec": {
     "type": 1,
     "chaincode_id": {
@@ -36,7 +36,7 @@
       "Args": [
         "deploy",
         "ch1",
-		"\nU\u0008\u0001\u0012I\n=github.com/hyperledger/fabric/examples/chaincode/go/marbles02\u0012\u0005mycc1\u001a\u00010\u001a\u0006\n\u0004init",
+		"\nU\b\u0001\u0012I\n=github.com/hyperledger/fabric/examples/chaincode/go/marbles02\u0012\u0005mycc1\u001a\u00010\u001a\u0006\n\u0004init",
         "",
         "escc",
         "vscc"
@@ -55,7 +55,7 @@
         "writes": [
           {
             "key": "mycc1",
-            "value": "\n\u0005mycc1\u0012\u00010\u001a\u0004escc\"\u0004vscc*\u0017\u0012\u0008\u0012\u0006\u0008\u0001\u0012\u0002\u0008\u0000\u001a\u000b\u0012\t\n\u0007DEFAULT2D\n ��$˞�K݂o�pJ{��_��(\u0015ݮ�\u003e\u001a�c�\tS�\u0012 \u0012V�1\u000e�\u000e��\u0010Q�i�$�VtV\\�\u0018L(�I����F�: E��ؿk�\u003c\u0015�x��F\r�\u0005��C9\u0001�\t�bA\u000e\u0018�5�B\u0019\u0012\u0008\u0012\u0006\u0008\u0001\u0012\u0002\u0008\u0000\u001a\r\u0012\u000b\n\u0007DEFAULT\u0010\u0001"
+            "value": "\n\u0005mycc1\u0012\u00010\u001a\u0004escc\"\u0004vscc*\u0017\u0012\b\u0012\u0006\b\u0001\u0012\u0002\b\u0000\u001a\u000b\u0012\t\n\u0007DEFAULT2D\n ��$˞�K݂o�pJ{��_��(\u0015ݮ�\u003e\u001a�c�\tS�\u0012 \u0012V�1\u000e�\u000e��\u0010Q�i�$�VtV\\�\u0018L(�I����F�: E��ؿk�\u003c\u0015�x��F\r�\u0005��C9\u0001�\t�bA\u000e\u0018�5�B\u0019\u0012\b\u0012\u0006\b\u0001\u0012\u0002\b\u0000\u001a\r\u0012\u000b\n\u0007DEFAULT\u0010\u0001"
           }
         ]
       }

diff --git a/docs/source/dev-setup/devenv.rst b/docs/source/dev-setup/devenv.rst
@@ -47,7 +47,7 @@ Go and SoftHSM are also available from Homebrew, but make sure you install the a
 
 ::
 
-    brew install go@1.21
+    brew install go@1.22
     brew install softhsm
 
 Docker Desktop must be launched to complete the installation, so be sure to open

diff --git a/docs/source/prereqs.md b/docs/source/prereqs.md
@@ -73,8 +73,8 @@ Optional: Install the latest Fabric supported version of [Go](https://golang.org
 installed (only required if you will be writing Go chaincode or SDK applications).
 
 ```shell
-brew install go@1.21.9
-go version # => go1.21.9 darwin/amd64
+brew install go@1.22.3
+go version # => go1.22.3 darwin/amd64
 ```
 
 ### JQ

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hyperledger/fabric
 
-go 1.21
+go 1.22
 
 require (
 	code.cloudfoundry.org/clock v1.0.0

diff --git a/internal/pkg/comm/server_test.go b/internal/pkg/comm/server_test.go
@@ -406,6 +406,7 @@ func TestNewGRPCServerInvalidParameters(t *testing.T) {
 		"listen tcp: unknown port tcp/1BBB",
 		"listen tcp: address tcp/1BBB: unknown port",
 		"listen tcp: lookup tcp/1BBB: Servname not supported for ai_socktype",
+		"listen tcp: lookup tcp/1BBB: unknown port",
 	}
 	require.Error(t, err, fmt.Sprintf("[%s], [%s] [%s] or [%s] expected", msgs[0], msgs[1], msgs[2], msgs[3]))
 	require.Contains(t, msgs, err.Error())

diff --git a/release_notes/v3.0.0-beta.md b/release_notes/v3.0.0-beta.md
@@ -37,7 +37,7 @@ All improvements and fixes as of v2.5.6 have also been included in v3.0.0-beta.
 Dependencies
 ------------
 Fabric v3.0.0-beta has been tested with the following dependencies:
-* Go 1.21.8
+* Go 1.22.3
 * CouchDB v3.3.3
 
 Fabric docker images on dockerhub utilize Ubuntu 20.04.

diff --git a/scripts/run-unit-tests.sh b/scripts/run-unit-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -xv
 
 # Copyright IBM Corp. All Rights Reserved.
 #
@@ -153,7 +153,7 @@ run_tests() {
         local -a serial
         while IFS= read -r pkg; do serial+=("$pkg"); done < <(serial_test_packages "$@")
         if [ "${#serial[@]}" -ne 0 ]; then
-            go test "${flags[@]}" -failfast -tags "$GO_TAGS" "${serial[@]}" -short -p 1 -timeout=20m
+            go test "${flags[@]}" -failfast -tags "$GO_TAGS" github.com/hyperledger/fabric/core/handlers/library "${serial[@]}" -short -p 1 -exec xprog -timeout=20m
         fi
 
         local -a parallel

diff --git a/vagrant/golang.sh b/vagrant/golang.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 GOROOT='/opt/go'
-GO_VERSION=1.21.9
+GO_VERSION=1.22.3
 
 # ----------------------------------------------------------------
 # Install Golang