Skip to content

Commit

Permalink
Update Go module dependencies for fabric v1.4.11
Browse files Browse the repository at this point in the history
Update Go module dependencies to use fabric v1.4.11 to pull in latest
bccsp updates.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
  • Loading branch information
denyeart authored and mastersingh24 committed Mar 7, 2021
1 parent 4305db7 commit b8bb426
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 32 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b
github.com/hyperledger/fabric v1.4.9
github.com/hyperledger/fabric v1.4.11
github.com/hyperledger/fabric-amcl v0.0.0-20200424173818-327c9e2cf77a
github.com/hyperledger/fabric-lib-go v1.0.0
github.com/jmoiron/sqlx v1.2.0
Expand All @@ -34,7 +34,7 @@ require (
github.com/prometheus/client_golang v0.9.2
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/procfs v0.2.0 // indirect
github.com/spf13/cast v1.3.1
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.3.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b/go.mod h1:zT/uzhd
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hyperledger/fabric v1.4.9 h1:Ght1O51URuaKBmFDNkKB+qdUF2Vb8CdcrVel+4hWy+w=
github.com/hyperledger/fabric v1.4.9/go.mod h1:tGFAOCT696D3rG0Vofd2dyWYLySHlh0aQjf7Q1HAju0=
github.com/hyperledger/fabric v1.4.11 h1:Z+cB0cPclR2VcoESlrcIRHI+vWv8TvRDESC9pwYw1nU=
github.com/hyperledger/fabric v1.4.11/go.mod h1:tGFAOCT696D3rG0Vofd2dyWYLySHlh0aQjf7Q1HAju0=
github.com/hyperledger/fabric-amcl v0.0.0-20200424173818-327c9e2cf77a h1:JAKZdGuUIjVmES0X31YUD7UqMR2rz/kxLluJuGvsXPk=
github.com/hyperledger/fabric-amcl v0.0.0-20200424173818-327c9e2cf77a/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE=
github.com/hyperledger/fabric-lib-go v1.0.0 h1:UL1w7c9LvHZUSkIvHTDGklxFv2kTeva1QI2emOVc324=
Expand Down
1 change: 0 additions & 1 deletion internal/pkg/util/csp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ func testMain(m *testing.M) int {

opts := factory.GetDefaultOpts()
opts.SwOpts.FileKeystore = &factory.FileKeystoreOpts{KeyStorePath: tmpDir}
opts.SwOpts.Ephemeral = false
csp, err = factory.GetBCCSPFromOpts(opts)
if err != nil {
fmt.Printf("Could not initialize BCCSP Factories [%s]", err)
Expand Down
1 change: 1 addition & 0 deletions scripts/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ function filterExcludedAndGeneratedFiles() {
'\.key$'
'(^|/)LICENSE$'
'\.md$'
'\.mod$'
'\.pb\.go$'
'\.pem$'
'\.png$'
Expand Down
2 changes: 0 additions & 2 deletions vendor/github.com/hyperledger/fabric/bccsp/factory/opts.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 3 additions & 8 deletions vendor/github.com/hyperledger/fabric/bccsp/factory/swfactory.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions vendor/github.com/hyperledger/fabric/bccsp/pkcs11/pkcs11.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ github.com/hashicorp/hcl/hcl/token
github.com/hashicorp/hcl/json/parser
github.com/hashicorp/hcl/json/scanner
github.com/hashicorp/hcl/json/token
# github.com/hyperledger/fabric v1.4.9
# github.com/hyperledger/fabric v1.4.11
## explicit
github.com/hyperledger/fabric/bccsp
github.com/hyperledger/fabric/bccsp/factory
Expand Down

0 comments on commit b8bb426

Please sign in to comment.