Skip to content

Replace remaining grpc references #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ineiti wants to merge 1 commit into
base: 249-minows-integration
Choose a base branch
from
Open

Replace remaining grpc references #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ that runs on a host and participate in the voting logic. The blockchain node
is built on top of Dela with an additional d-voting smart contract, proxy, and
two services: DKG and verifiable Shuffling. The blockchain node is more
accurately a subsystem, as it wraps many other components. Blockchain nodes
communicate through gRPC with the [minogrpc][minogrpc] network overlay. We
communicate through WebSocket with the [minows][minows] network overlay. We
sometimes refer to the blockchain node simply as a "node".

The following component diagrams summarizes the interaction between those
high-level components:

[minogrpc]: https://github.com/c4dt/dela/tree/master/mino/minogrpc
[minows]: https://github.com/c4dt/dela/tree/master/mino/minows

![Global component diagram](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/dedis/d-voting/main/docs/assets/component-global.puml)

Expand Down Expand Up @@ -440,13 +440,13 @@ In three different terminal sessions, from the root folder:
pk=adbacd10fdb9822c71025d6d00092b8a4abb5ebcb673d28d863f7c7c5adaddf3

LLVL=info dvoting --config /tmp/node1 start --postinstall \
--promaddr :9100 --proxyaddr :9080 --proxykey $pk --listen tcp://0.0.0.0:2001 --public //localhost:2001
--promaddr :9100 --proxyaddr :9080 --proxykey $pk --listen /ip4/0.0.0.0/tcp/2001/ws --public /ip4/127.0.0.1/tcp/2001/ws

LLVL=info dvoting --config /tmp/node2 start --postinstall \
--promaddr :9101 --proxyaddr :9081 --proxykey $pk --listen tcp://0.0.0.0:2002 --public //localhost:2002
--promaddr :9101 --proxyaddr :9081 --proxykey $pk --listen /ip4/0.0.0.0/tcp/2002/ws --public /ip4/127.0.0.1/tcp/2002/ws

LLVL=info dvoting --config /tmp/node3 start --postinstall \
--promaddr :9102 --proxyaddr :9082 --proxykey $pk --listen tcp://0.0.0.0:2003 --public //localhost:2003
--promaddr :9102 --proxyaddr :9082 --proxykey $pk --listen /ip4/0.0.0.0/tcp/2003/ws --public /ip4/127.0.0.1/tcp/2003/ws
```

If you restart, do not forget to remove the old state:
Expand Down
10 changes: 5 additions & 5 deletions scripts/system-tests/proxies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pass "list proxies"
info "Registering ${PROXY_COUNT} temporary proxies"

for i in $(seq 1 "$PROXY_COUNT"); do
node_addr="grpc://zz-system-test-${i}:2000"
node_addr="/dns4/zz-system-test-${i}/tcp/2000/ws"
proxy_addr="http://zz-system-test-${i}:8080"

NODE_ADDRS+=("$node_addr")
Expand All @@ -81,7 +81,7 @@ info "Verifying registered proxies"
response="$(api_get "/api/proxies")"

for i in $(seq 1 "$PROXY_COUNT"); do
node_addr="grpc://zz-system-test-${i}:2000"
node_addr="/dns4/zz-system-test-${i}/tcp/2000/ws"
expected_proxy="http://zz-system-test-${i}:8080"

actual_proxy="$(jq -r --arg node "$node_addr" '.Proxies[$node]' <<<"$response")"
Expand All @@ -93,7 +93,7 @@ done
info "Reading proxies individually"

for i in $(seq 1 "$PROXY_COUNT"); do
node_addr="grpc://zz-system-test-${i}:2000"
node_addr="/dns4/zz-system-test-${i}/tcp/2000/ws"
expected_proxy="http://zz-system-test-${i}:8080"

encoded="$(jq -nr --arg value "$node_addr" '$value | @uri')"
Expand All @@ -111,7 +111,7 @@ done
info "Updating proxies"

for i in $(seq 1 "$PROXY_COUNT"); do
node_addr="grpc://zz-system-test-${i}:2000"
node_addr="/dns4/zz-system-test-${i}/tcp/2000/ws"
updated_proxy="http://zz-system-test-${i}:8081"

encoded="$(jq -nr --arg value "$node_addr" '$value | @uri')"
Expand All @@ -127,7 +127,7 @@ done
info "Verifying proxy updates"

for i in $(seq 1 "$PROXY_COUNT"); do
node_addr="grpc://zz-system-test-${i}:2000"
node_addr="/dns4/zz-system-test-${i}/tcp/2000/ws"
expected_proxy="http://zz-system-test-${i}:8081"

encoded="$(jq -nr --arg value "$node_addr" '$value | @uri')"
Expand Down
Loading