Skip to content

Commit 52f2fae

Browse files
authored
change protoutil dependency from fabric to fabric-x-common (#15)
The fabric dependency was old (v1.4.0) and unnecessary, because the code has been moved to fabric-x-common. It at least gets rid of some false positives in vulnerability scanners. Signed-off-by: Arne Rutjes <arne123@gmail.com>
1 parent 5826e34 commit 52f2fae

12 files changed

Lines changed: 11 additions & 15 deletions

File tree

blocks/fabric/parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/hyperledger/fabric-protos-go-apiv2/ledger/rwset"
1515
"github.com/hyperledger/fabric-protos-go-apiv2/ledger/rwset/kvrwset"
1616
"github.com/hyperledger/fabric-protos-go-apiv2/peer"
17+
"github.com/hyperledger/fabric-x-common/protoutil"
1718
sdk "github.com/hyperledger/fabric-x-sdk"
1819
"github.com/hyperledger/fabric-x-sdk/blocks"
19-
"github.com/hyperledger/fabric/protoutil"
2020
"google.golang.org/protobuf/proto"
2121
)
2222

blocks/fabricx/parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/hyperledger/fabric-protos-go-apiv2/peer"
1515
"github.com/hyperledger/fabric-x-common/api/applicationpb"
1616
"github.com/hyperledger/fabric-x-common/api/committerpb"
17+
"github.com/hyperledger/fabric-x-common/protoutil"
1718
sdk "github.com/hyperledger/fabric-x-sdk"
1819
"github.com/hyperledger/fabric-x-sdk/blocks"
19-
"github.com/hyperledger/fabric/protoutil"
2020
"google.golang.org/protobuf/proto"
2121
)
2222

endorsement/fabric/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
"github.com/hyperledger/fabric-protos-go-apiv2/ledger/rwset"
1414
"github.com/hyperledger/fabric-protos-go-apiv2/ledger/rwset/kvrwset"
1515
"github.com/hyperledger/fabric-protos-go-apiv2/peer"
16+
"github.com/hyperledger/fabric-x-common/protoutil"
1617
sdk "github.com/hyperledger/fabric-x-sdk"
1718
"github.com/hyperledger/fabric-x-sdk/blocks"
1819
"github.com/hyperledger/fabric-x-sdk/endorsement"
19-
"github.com/hyperledger/fabric/protoutil"
2020
"google.golang.org/protobuf/proto"
2121
)
2222

endorsement/proposal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020

2121
"github.com/hyperledger/fabric-protos-go-apiv2/common"
2222
"github.com/hyperledger/fabric-protos-go-apiv2/peer"
23+
"github.com/hyperledger/fabric-x-common/protoutil"
2324
"github.com/hyperledger/fabric-x-sdk/blocks"
24-
"github.com/hyperledger/fabric/protoutil"
2525
)
2626

2727
// Builder creates the signed ProposalResponse.

example/endorser/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
module github.com/hyperledger/fabric-x-sdk/example/endorser
77

8-
go 1.26
8+
go 1.26.2
99

1010
replace github.com/hyperledger/fabric-x-sdk => ../..
1111

@@ -29,7 +29,6 @@ require (
2929
github.com/getsentry/sentry-go v0.27.0 // indirect
3030
github.com/gogo/protobuf v1.3.2 // indirect
3131
github.com/google/uuid v1.6.0 // indirect
32-
github.com/hyperledger/fabric v1.4.0-rc1.0.20240918034325-94590aa4332b // indirect
3332
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3433
github.com/jackc/pgpassfile v1.0.0 // indirect
3534
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect

fabrictest/peer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"github.com/hyperledger/fabric-protos-go-apiv2/orderer"
1616
"github.com/hyperledger/fabric-protos-go-apiv2/peer"
1717
"github.com/hyperledger/fabric-x-common/api/committerpb"
18+
"github.com/hyperledger/fabric-x-common/protoutil"
1819
"github.com/hyperledger/fabric-x-sdk/endorsement"
1920
"github.com/hyperledger/fabric-x-sdk/endorsement/fabric"
20-
"github.com/hyperledger/fabric/protoutil"
2121
"google.golang.org/grpc"
2222
"google.golang.org/protobuf/proto"
2323
"google.golang.org/protobuf/types/known/emptypb"

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hyperledger/fabric-x-sdk
22

3-
go 1.26
3+
go 1.26.2
44

55
tool (
66
github.com/google/addlicense
@@ -10,7 +10,6 @@ tool (
1010
)
1111

1212
require (
13-
github.com/hyperledger/fabric v1.4.0-rc1.0.20240918034325-94590aa4332b
1413
github.com/hyperledger/fabric-lib-go v1.1.3
1514
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7
1615
github.com/hyperledger/fabric-x-common v0.1.1-0.20260219094834-26c5a49ed548

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,8 +885,6 @@ github.com/hyperledger-labs/SmartBFT v0.0.0-20250503203013-eb005eef8866 h1:Mu/6N
885885
github.com/hyperledger-labs/SmartBFT v0.0.0-20250503203013-eb005eef8866/go.mod h1:9aNHNXsCVy/leGz2gpTC1eOL5QecxbSAGjqsLh4T1LM=
886886
github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc h1:3Ykk6MtyfnlzMOQry9zkxsoLWpCWZwDPqehO/BJwArM=
887887
github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc/go.mod h1:Kofn6A6WWea1ZM8Rys5aBW9dszwJ7Ywa0kyyYL0TPYw=
888-
github.com/hyperledger/fabric v1.4.0-rc1.0.20240918034325-94590aa4332b h1:OzSgIDx5owx8InPK/w/tLNajLOedYwFbKqe5QQUz7jw=
889-
github.com/hyperledger/fabric v1.4.0-rc1.0.20240918034325-94590aa4332b/go.mod h1:YTYvaVg6DFLvvEnUMUNnXlpQx4LCaXnme/l6g1ukHTM=
890888
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M=
891889
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE=
892890
github.com/hyperledger/fabric-lib-go v1.1.3 h1:alvgtBlbm373P3BLIxdHKVT4I64mORDwQy49uTWdkI4=

integration/integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"time"
2323

2424
"github.com/hyperledger/fabric-protos-go-apiv2/peer"
25+
"github.com/hyperledger/fabric-x-common/protoutil"
2526
sdk "github.com/hyperledger/fabric-x-sdk"
2627
"github.com/hyperledger/fabric-x-sdk/blocks"
2728
"github.com/hyperledger/fabric-x-sdk/endorsement"
@@ -33,7 +34,6 @@ import (
3334
nfab "github.com/hyperledger/fabric-x-sdk/network/fabric"
3435
nfabx "github.com/hyperledger/fabric-x-sdk/network/fabricx"
3536
"github.com/hyperledger/fabric-x-sdk/state"
36-
"github.com/hyperledger/fabric/protoutil"
3737
"google.golang.org/grpc/grpclog"
3838
_ "modernc.org/sqlite"
3939
)

network/fabric/packager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"time"
1111

1212
"github.com/hyperledger/fabric-protos-go-apiv2/common"
13+
"github.com/hyperledger/fabric-x-common/protoutil"
1314
sdk "github.com/hyperledger/fabric-x-sdk"
1415
"github.com/hyperledger/fabric-x-sdk/network"
15-
"github.com/hyperledger/fabric/protoutil"
1616
)
1717

1818
func NewTxPackager(s sdk.Signer) TxPackager {

0 commit comments

Comments
 (0)