Skip to content

Commit 187f26e

Browse files
sandeepnRESpetermetz
sandeepnRES
authored and
petermetz
committed
fix(relay): rust build fails after tokio bump from 0.2.25 to 1.18.5
 Additionally: - upgrade other dependencies for relay - added tls based unit test in relay - add retry logic in leveldb for open - fix fabric testing workflows: go install bug Signed-off-by: Sandeep Nishad <[email protected]> Signed-off-by: Ry Jones <[email protected]>
1 parent 6b76f6a commit 187f26e

34 files changed

+3462
-2150
lines changed

‎.github/workflows/test_weaver-asset-exchange-fabric.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ jobs:
122122
run: |
123123
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
124124
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
125-
go install google.golang.org/protobuf/cmd/protoc-gen-go
126-
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
125+
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
126+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
127127
128128
# PROTOS
129129
- name: Build JS Protos

‎.github/workflows/test_weaver-asset-transfer.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,8 @@ jobs:
454454
run: |
455455
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
456456
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
457-
go install google.golang.org/protobuf/cmd/protoc-gen-go
458-
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
457+
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
458+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
459459
460460
# PROTOS
461461
- name: Build GO Protos

‎.github/workflows/test_weaver-data-sharing.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,8 @@ jobs:
368368
run: |
369369
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
370370
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
371-
go install google.golang.org/protobuf/cmd/protoc-gen-go
372-
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
371+
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
372+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
373373
374374
# PROTOS
375375
- name: Build GO Protos
@@ -748,8 +748,8 @@ jobs:
748748
run: |
749749
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
750750
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
751-
go install google.golang.org/protobuf/cmd/protoc-gen-go
752-
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
751+
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
752+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
753753
754754
# PROTOS
755755
- name: Build GO Protos

‎.github/workflows/test_weaver-relay.yml

+109-17
Original file line numberDiff line numberDiff line change
@@ -21,84 +21,176 @@ jobs:
2121
steps:
2222
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2323
- uses: actions/checkout@v2
24-
24+
2525
- name: Install RUST Toolchain minimal stable with clippy and rustfmt
2626
uses: actions-rs/toolchain@v1
2727
with:
2828
profile: minimal
2929
toolchain: stable
3030
components: rustfmt, clippy
31-
31+
3232
- name: Use Protoc 3.15
3333
run: |
3434
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
3535
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
36-
36+
3737
- name: Build Protos RS
38-
run: make build
38+
run: |
39+
export PATH="$PATH:${GITHUB_WORKSPACE}/protoc/bin"
40+
make build
3941
working-directory: weaver/common/protos-rs
40-
42+
4143
- name: Get Latest Relay Dependencies
4244
run: |
4345
make protos-local
4446
cargo update -p nom
4547
cargo update -p lexical-core
4648
working-directory: weaver/core/relay
47-
49+
4850
- name: Build Image
4951
run: make
5052
working-directory: weaver/core/relay
51-
53+
5254
- name: Run Dummy Relay
5355
run: RELAY_CONFIG=config/Dummy_Relay.toml cargo run --bin server &> relay-dummy.out &
5456
working-directory: weaver/core/relay
55-
57+
5658
- name: Run Dummy Driver
5759
run: RELAY_CONFIG=config/Dummy_Relay.toml cargo run --bin dummy-driver &> driver-dummy.out &
5860
working-directory: weaver/core/relay
59-
61+
6062
- name: Mock Client Test
6163
run: |
6264
echo "Waiting for Dummy Relay and Driver to come up"
6365
sleep 30
6466
cargo run --bin client 9085 localhost:9085/Dummy_Network/abc:abc:abc:abc
6567
working-directory: weaver/core/relay
66-
67-
relay:
68+
69+
relay-tls-local:
6870
# if: ${{ false }}
6971
runs-on: buildjet-2vcpu-ubuntu-2204
7072
steps:
7173
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
7274
- uses: actions/checkout@v2
73-
75+
7476
- name: Install RUST Toolchain minimal stable with clippy and rustfmt
7577
uses: actions-rs/toolchain@v1
7678
with:
7779
profile: minimal
7880
toolchain: stable
7981
components: rustfmt, clippy
80-
82+
83+
- name: Use Protoc 3.15
84+
run: |
85+
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
86+
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
87+
88+
- name: Build Protos RS
89+
run: |
90+
export PATH="$PATH:${GITHUB_WORKSPACE}/protoc/bin"
91+
make build
92+
working-directory: weaver/common/protos-rs
93+
8194
- name: Get Latest Relay Dependencies
8295
run: |
96+
make protos-local
8397
cargo update -p nom
8498
cargo update -p lexical-core
8599
working-directory: weaver/core/relay
86-
100+
101+
- name: Build Image
102+
run: make
103+
working-directory: weaver/core/relay
104+
105+
- name: Run Dummy Relay
106+
run: RELAY_CONFIG=config/Dummy_Relay_tls.toml cargo run --bin server &> relay-dummy.out &
107+
working-directory: weaver/core/relay
108+
109+
- name: Run Dummy Driver
110+
run: RELAY_CONFIG=config/Dummy_Relay_tls.toml cargo run --bin dummy-driver &> driver-dummy.out &
111+
working-directory: weaver/core/relay
112+
113+
- name: Mock Client Test
114+
run: |
115+
echo "Waiting for Dummy Relay and Driver to come up"
116+
sleep 30
117+
cargo run --bin client-tls 9085 localhost:9085/Dummy_Network/abc:abc:abc:abc
118+
working-directory: weaver/core/relay
119+
120+
relay:
121+
if: ${{ false }}
122+
runs-on: buildjet-2vcpu-ubuntu-2204
123+
steps:
124+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
125+
- uses: actions/checkout@v2
126+
127+
- name: Install RUST Toolchain minimal stable with clippy and rustfmt
128+
uses: actions-rs/toolchain@v1
129+
with:
130+
profile: minimal
131+
toolchain: stable
132+
components: rustfmt, clippy
133+
134+
- name: Get Latest Relay Dependencies
135+
run: |
136+
cargo update -p nom
137+
cargo update -p lexical-core
138+
working-directory: weaver/core/relay
139+
87140
- name: Build Image
88141
run: make build
89142
working-directory: weaver/core/relay
90-
143+
91144
- name: Run Dummy Relay
92145
run: RELAY_CONFIG=config/Dummy_Relay.toml cargo run --bin server &> relay-dummy.out &
93146
working-directory: weaver/core/relay
94-
147+
95148
- name: Run Dummy Driver
96149
run: RELAY_CONFIG=config/Dummy_Relay.toml cargo run --bin dummy-driver &> driver-dummy.out &
97150
working-directory: weaver/core/relay
98-
151+
99152
- name: Mock Client Test
100153
run: |
101154
echo "Waiting for Dummy Relay and Driver to come up"
102155
sleep 30
103156
cargo run --bin client 9085 localhost:9085/Dummy_Network/abc:abc:abc:abc
104157
working-directory: weaver/core/relay
158+
159+
relay-tls:
160+
if: ${{ false }}
161+
runs-on: buildjet-2vcpu-ubuntu-2204
162+
steps:
163+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
164+
- uses: actions/checkout@v2
165+
166+
- name: Install RUST Toolchain minimal stable with clippy and rustfmt
167+
uses: actions-rs/toolchain@v1
168+
with:
169+
profile: minimal
170+
toolchain: stable
171+
components: rustfmt, clippy
172+
173+
- name: Get Latest Relay Dependencies
174+
run: |
175+
cargo update -p nom
176+
cargo update -p lexical-core
177+
working-directory: weaver/core/relay
178+
179+
- name: Build Image
180+
run: make build
181+
working-directory: weaver/core/relay
182+
183+
- name: Run Dummy Relay
184+
run: RELAY_CONFIG=config/Dummy_Relay_tls.toml cargo run --bin server &> relay-dummy.out &
185+
working-directory: weaver/core/relay
186+
187+
- name: Run Dummy Driver
188+
run: RELAY_CONFIG=config/Dummy_Relay_tls.toml cargo run --bin dummy-driver &> driver-dummy.out &
189+
working-directory: weaver/core/relay
190+
191+
- name: Mock Client Test
192+
run: |
193+
echo "Waiting for Dummy Relay and Driver to come up"
194+
sleep 30
195+
cargo run --bin client-tls 9085 localhost:9085/Dummy_Network/abc:abc:abc:abc
196+
working-directory: weaver/core/relay

0 commit comments

Comments
 (0)