Merge pull request #117 from sanvenDev/main

Clean Up following use of modules, fix Asset-Mgmt module
hyperledger-labs · Jul 26, 2021 · 2210f22 · 2210f22
2 parents d001e6a + 16b0029
commit 2210f22
Show file tree

Hide file tree

Showing 82 changed files with 4,116 additions and 571 deletions.
diff --git a/common/protos-go/build-protos.sh b/common/protos-go/build-protos.sh
@@ -4,4 +4,9 @@ BUILDDIR=./
 PROTOSDIR=../protos
 FABRIC_PROTOSDIR=../fabric-protos
 
-protoc --proto_path=$PROTOSDIR --proto_path=$FABRIC_PROTOSDIR --go-grpc_out=$BUILDDIR --go_out=$BUILDDIR --go_opt=paths=source_relative $PROTOSDIR/common/query.proto $PROTOSDIR/common/ack.proto $PROTOSDIR/common/proofs.proto $PROTOSDIR/common/state.proto $PROTOSDIR/corda/view_data.proto $PROTOSDIR/fabric/view_data.proto $PROTOSDIR/common/access_control.proto $PROTOSDIR/common/membership.proto $PROTOSDIR/common/verification_policy.proto $PROTOSDIR/common/interop_payload.proto $PROTOSDIR/common/asset_locks.proto $PROTOSDIR/networks/networks.proto $PROTOSDIR/relay/datatransfer.proto $PROTOSDIR/driver/driver.proto
+protoc --proto_path=$PROTOSDIR --proto_path=$FABRIC_PROTOSDIR --go_out=$BUILDDIR --go_opt=paths=source_relative $PROTOSDIR/common/query.proto $PROTOSDIR/common/ack.proto $PROTOSDIR/common/proofs.proto $PROTOSDIR/common/state.proto $PROTOSDIR/common/access_control.proto $PROTOSDIR/common/membership.proto $PROTOSDIR/common/verification_policy.proto $PROTOSDIR/common/interop_payload.proto $PROTOSDIR/common/asset_locks.proto
+protoc --proto_path=$PROTOSDIR --proto_path=$FABRIC_PROTOSDIR --go_out=$BUILDDIR --go_opt=paths=source_relative $PROTOSDIR/fabric/view_data.proto
+protoc --proto_path=$PROTOSDIR --proto_path=$FABRIC_PROTOSDIR --go_out=$BUILDDIR --go_opt=paths=source_relative $PROTOSDIR/corda/view_data.proto
+protoc --proto_path=$PROTOSDIR --proto_path=$FABRIC_PROTOSDIR --go-grpc_out=paths=source_relative:$BUILDDIR --go_out=paths=source_relative:$BUILDDIR $PROTOSDIR/networks/networks.proto
+protoc --proto_path=$PROTOSDIR --proto_path=$FABRIC_PROTOSDIR --go-grpc_out=paths=source_relative:$BUILDDIR --go_out=paths=source_relative:$BUILDDIR $PROTOSDIR/relay/datatransfer.proto
+protoc --proto_path=$PROTOSDIR --proto_path=$FABRIC_PROTOSDIR --go-grpc_out=paths=source_relative:$BUILDDIR --go_out=paths=source_relative:$BUILDDIR $PROTOSDIR/driver/driver.proto
diff --git a/common/protos-go/common/access_control.pb.go b/common/protos-go/common/access_control.pb.go
diff --git a/common/protos-go/common/ack.pb.go b/common/protos-go/common/ack.pb.go
diff --git a/common/protos-go/common/asset_locks.pb.go b/common/protos-go/common/asset_locks.pb.go
diff --git a/common/protos-go/common/interop_payload.pb.go b/common/protos-go/common/interop_payload.pb.go
diff --git a/common/protos-go/common/membership.pb.go b/common/protos-go/common/membership.pb.go
diff --git a/common/protos-go/common/proofs.pb.go b/common/protos-go/common/proofs.pb.go
diff --git a/common/protos-go/common/query.pb.go b/common/protos-go/common/query.pb.go
diff --git a/common/protos-go/common/state.pb.go b/common/protos-go/common/state.pb.go
diff --git a/common/protos-go/common/verification_policy.pb.go b/common/protos-go/common/verification_policy.pb.go
diff --git a/common/protos-go/corda/view_data.pb.go b/common/protos-go/corda/view_data.pb.go
diff --git a/common/protos-go/driver/driver.pb.go b/common/protos-go/driver/driver.pb.go
diff --git a/common/protos-go/driver/driver_grpc.pb.go b/common/protos-go/driver/driver_grpc.pb.go
diff --git a/common/protos-go/fabric/view_data.pb.go b/common/protos-go/fabric/view_data.pb.go
diff --git a/common/protos-go/go.mod b/common/protos-go/go.mod
@@ -3,7 +3,7 @@ module github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go
 go 1.16
 
 require (
-	github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31
+	github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871
 	google.golang.org/grpc v1.39.0
 	google.golang.org/protobuf v1.27.1
 )
diff --git a/common/protos-go/go.sum b/common/protos-go/go.sum
@@ -39,8 +39,8 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31 h1:T/uwoFIUioDDLffuJ/XgMLOWCUcx95/xXidv5igafl8=
-github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
+github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871 h1:d7do07Q4LaOFAEWceRwUwVDdcfx3BdLeZYyUGtbHfRk=
+github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=