Skip to content

Commit 1d02aa3

Browse files
committed
remove weaver
Signed-off-by: Angelo De Caro <angelo.decaro@gmail.com>
1 parent 0fcf494 commit 1d02aa3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+6
-3137
lines changed

.github/workflows/tests.yml

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ jobs:
7070
pingpong,
7171
stoprestart,
7272
twonets,
73-
weaver-relay,
7473
chaincode-events
7574
]
7675

Makefile

+1-14
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ unit-tests-race: testing-docker-images
5454
cd integration/nwo/; export FAB_BINS=$(FAB_BINS); go test -race -cover ./...
5555

5656
.PHONY: docker-images
57-
docker-images: fabric-docker-images weaver-docker-images orion-server-images monitoring-docker-images testing-docker-images
57+
docker-images: fabric-docker-images orion-server-images monitoring-docker-images testing-docker-images
5858

5959
.PHONY: fabric-docker-images
6060
fabric-docker-images:
@@ -63,13 +63,6 @@ fabric-docker-images:
6363
docker pull hyperledger/fabric-ccenv:$(FABRIC_TWO_DIGIT_VERSION)
6464
docker image tag hyperledger/fabric-ccenv:$(FABRIC_TWO_DIGIT_VERSION) hyperledger/fabric-ccenv:latest
6565

66-
.PHONY: weaver-docker-images
67-
weaver-docker-images:
68-
docker pull ghcr.io/hyperledger-labs/weaver-fabric-driver:1.2.1
69-
docker image tag ghcr.io/hyperledger-labs/weaver-fabric-driver:1.2.1 hyperledger-labs/weaver-fabric-driver:latest
70-
docker pull ghcr.io/hyperledger-labs/weaver-relay-server:1.2.1
71-
docker image tag ghcr.io/hyperledger-labs/weaver-relay-server:1.2.1 hyperledger-labs/weaver-relay-server:latest
72-
7366
.PHONY: monitoring-docker-images
7467
monitoring-docker-images:
7568
docker pull ghcr.io/hyperledger-labs/explorer-db:latest
@@ -127,10 +120,6 @@ integration-tests-atsafsc:
127120
integration-tests-twonets:
128121
cd ./integration/fabric/twonets; export FAB_BINS=$(FAB_BINS); ginkgo $(GINKGO_TEST_OPTS) .
129122

130-
.PHONY: integration-tests-weaver-relay
131-
integration-tests-weaver-relay:
132-
cd ./integration/fabric/weaver/relay; export FAB_BINS=$(FAB_BINS); ginkgo $(GINKGO_TEST_OPTS) .
133-
134123
.PHONY: integration-tests-fabric-stoprestart
135124
integration-tests-fabric-stoprestart:
136125
cd ./integration/fabric/stoprestart; export FAB_BINS=$(FAB_BINS); ginkgo $(GINKGO_TEST_OPTS) .
@@ -151,7 +140,6 @@ integration-tests-orioncars:
151140
tidy:
152141
@go mod tidy
153142
cd tools; go mod tidy
154-
cd integration/fabric/weaver/relay/chaincode; go mod tidy
155143
cd platform/fabric/services/state/cc/query; go mod tidy
156144

157145
.PHONY: clean
@@ -166,7 +154,6 @@ clean:
166154
rm -rf ./integration/fabric/iou/cmd/
167155
rm -rf ./integration/fabric/iou/testdata/
168156
rm -rf ./integration/fabric/twonets/cmd
169-
rm -rf ./integration/fabric/weaver/relay/cmd
170157
rm -rf ./integration/fabric/stoprestart/cmd
171158
rm -rf ./integration/fsc/stoprestart/cmd
172159
rm -rf ./integration/orion/cars/cmd

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ If you are a skilled software engineer, you will be able to leverage the full po
9595
But, this is not all. The Fabric Smart Client is a client-side component that can be used to develop applications:
9696

9797
- Based on other backends like [`Orion`](https://github.com/hyperledger-labs/orion-server).
98-
- With interoperability using the [`Weaver`](https://github.com/hyperledger-labs/weaver-dlt-interoperability) framework.
9998
- With TEE support as offered by [`Fabric Private Chaincode`](https://github.com/hyperledger/fabric-private-chaincode).
10099
- And more...
101100

docs/sdk.md

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ import (
7676
digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"
7777
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
7878
fabricsdk "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk/dig"
79-
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/weaver"
8079
)
8180

8281
type SDK struct {

go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@ require (
1515
github.com/go-kit/log v0.2.1
1616
github.com/gogo/protobuf v1.3.2
1717
github.com/golang/protobuf v1.5.4
18-
github.com/google/go-cmp v0.6.0
1918
github.com/gorilla/mux v1.8.1
2019
github.com/gorilla/websocket v1.5.3
2120
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
2221
github.com/hashicorp/consul/sdk v0.16.1
2322
github.com/hyperledger-labs/orion-sdk-go v0.2.10
2423
github.com/hyperledger-labs/orion-server v0.2.10
25-
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.3-alpha.1
26-
github.com/hyperledger-labs/weaver-dlt-interoperability/sdks/fabric/go-sdk v1.2.3-alpha.1.0.20210812140206-37f430515b8c
2724
github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2
2825
github.com/hyperledger/fabric-chaincode-go v0.0.0-20240704073638-9fb89180dc17
2926
github.com/hyperledger/fabric-contract-api-go v1.2.2
@@ -69,6 +66,7 @@ require (
6966

7067
require (
7168
github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
69+
github.com/google/go-cmp v0.6.0 // indirect
7270
github.com/libp2p/go-libp2p-routing-helpers v0.7.4 // indirect
7371
github.com/pion/datachannel v1.5.9 // indirect
7472
github.com/pion/dtls/v2 v2.2.12 // indirect

go.sum

-57
Large diffs are not rendered by default.

integration/fabric/weaver/relay/README.md

-20
This file was deleted.

integration/fabric/weaver/relay/chaincode/chaincode.go

-48
This file was deleted.

integration/fabric/weaver/relay/chaincode/go.mod

-36
This file was deleted.

0 commit comments

Comments
 (0)