Skip to content

Commit

Permalink
Rename leftovers of "portal" to "connsumer"
Browse files Browse the repository at this point in the history
  • Loading branch information
shleikes committed Dec 3, 2024
1 parent 1b12d07 commit df92b1f
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion protocol/integration/protocol_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2154,7 +2154,7 @@ func TestArchiveProvidersRetryOnParsedHash(t *testing.T) {
ChainId: specId,
SeenBlock: 1005,
BlocksHashesToHeights: []*pairingtypes.BlockHashToHeight{{Hash: blockHash, Height: spectypes.NOT_APPLICABLE}},
}) // caching in the portal doesn't care about hashes, and we don't have data on finalization yet
}) // caching in the consumer doesn't care about hashes, and we don't have data on finalization yet
cancel()
if err != nil {
continue
Expand Down
2 changes: 1 addition & 1 deletion protocol/rpcconsumer/rpcconsumer_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ func (rpccs *RPCConsumerServer) sendRelayToProvider(
SharedStateId: sharedStateId,
SeenBlock: protocolMessage.RelayPrivateData().SeenBlock,
BlocksHashesToHeights: rpccs.newBlocksHashesToHeightsSliceFromRequestedBlockHashes(protocolMessage.GetRequestedBlocksHashes()),
}) // caching in the portal doesn't care about hashes, and we don't have data on finalization yet
}) // caching in the consumer doesn't care about hashes, and we don't have data on finalization yet
cancel()
reply := cacheReply.GetReply()

Expand Down
2 changes: 1 addition & 1 deletion scripts/pre_setups/init_eth_archive_mix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ screen -d -m -S provider$i bash -c "source ~/.bashrc; lavap rpcprovider \
$EXTRA_PROVIDER_FLAGS --geolocation 1 --log_level debug --from servicer$i --chain-id lava 2>&1 | tee $LOGS_DIR/PROVIDER$i.log" && sleep 0.25

screen -d -m -S portals bash -c "source ~/.bashrc; lavap rpcconsumer consumer_examples/ethereum_example.yml\
$EXTRA_PORTAL_FLAGS --cache-be "127.0.0.1:7778" --geolocation 1 --debug-relays --log_level debug --from user1 --chain-id lava --allow-insecure-provider-dialing 2>&1 | tee $LOGS_DIR/PORTAL.log" && sleep 0.25
$EXTRA_PORTAL_FLAGS --cache-be "127.0.0.1:7778" --geolocation 1 --debug-relays --log_level debug --from user1 --chain-id lava --allow-insecure-provider-dialing 2>&1 | tee $LOGS_DIR/CONSUMER.log" && sleep 0.25
echo "--- setting up screens done ---"
screen -ls

Expand Down
4 changes: 2 additions & 2 deletions scripts/setup_providers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ $EXTRA_PROVIDER_FLAGS --geolocation "$GEOLOCATION" --log_level debug --from serv
# $PROVIDER3_LISTENER MANTLE jsonrpc '$MANTLE_JRPC' \

echo; echo "#### Starting consumer ####"
# Setup Portal
# Setup Consumer
screen -d -m -S portals bash -c "source ~/.bashrc; lavap rpcconsumer consumer_examples/full_consumer_example.yml\
$EXTRA_PORTAL_FLAGS --cache-be "127.0.0.1:7778" --geolocation "$GEOLOCATION" --debug-relays --log_level debug --from user1 --chain-id lava --allow-insecure-provider-dialing --strategy distributed 2>&1 | tee $LOGS_DIR/PORTAL.log" && sleep 0.25
$EXTRA_PORTAL_FLAGS --cache-be "127.0.0.1:7778" --geolocation "$GEOLOCATION" --debug-relays --log_level debug --from user1 --chain-id lava --allow-insecure-provider-dialing --strategy distributed 2>&1 | tee $LOGS_DIR/CONSUMER.log" && sleep 0.25
# 127.0.0.1:3385 MANTLE jsonrpc \

echo "--- setting up screens done ---"
Expand Down
4 changes: 2 additions & 2 deletions scripts/test/jail_provider_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ $PROVIDER4_LISTENER LAV1 tendermintrpc '$LAVA_RPC,$LAVA_RPC' \
$PROVIDER4_LISTENER LAV1 grpc '$LAVA_GRPC' \
$EXTRA_PROVIDER_FLAGS --chain-id=lava --metrics-listen-address ":7780" --geolocation 1 --log_level debug --from servicer4 2>&1 | tee $LOGS_DIR/PROVIDER4.log"

# Setup Portal
# Setup Consumer
screen -d -m -S portals bash -c "source ~/.bashrc; lava-protocol rpcconsumer \
127.0.0.1:3333 ETH1 jsonrpc \
127.0.0.1:3360 LAV1 rest 127.0.0.1:3361 LAV1 tendermintrpc 127.0.0.1:3362 LAV1 grpc \
$EXTRA_PORTAL_FLAGS --metrics-listen-address ":7779" --geolocation 1 --log_level debug --from user1 --chain-id lava --allow-insecure-provider-dialing 2>&1 | tee $LOGS_DIR/PORTAL.log"
$EXTRA_PORTAL_FLAGS --metrics-listen-address ":7779" --geolocation 1 --log_level debug --from user1 --chain-id lava --allow-insecure-provider-dialing 2>&1 | tee $LOGS_DIR/CONSUMER.log"


# need to wait 8 epochs for the provider to be jail eligible
Expand Down
2 changes: 1 addition & 1 deletion scripts/test_spec_full.sh
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ done
echo "[+]generated consumer config: $output_consumer_yaml"
cat $output_consumer_yaml
if [ "$dry" = false ]; then
screen -d -m -S consumers bash -c "source ~/.bashrc; lavap rpcconsumer testutil/debugging/logs/consumer.yml $EXTRA_PORTAL_FLAGS --geolocation 1 --debug-relays --log_level debug --from user1 --chain-id lava --allow-insecure-provider-dialing --metrics-listen-address ":7779" 2>&1 | tee $LOGS_DIR/PORTAL.log"
screen -d -m -S consumers bash -c "source ~/.bashrc; lavap rpcconsumer testutil/debugging/logs/consumer.yml $EXTRA_PORTAL_FLAGS --geolocation 1 --debug-relays --log_level debug --from user1 --chain-id lava --allow-insecure-provider-dialing --metrics-listen-address ":7779" 2>&1 | tee $LOGS_DIR/CONSUMER.log"

echo "[+] letting providers start and running health check then running command with flags: $test_consumer_command_args"
sleep 10
Expand Down

0 comments on commit df92b1f

Please sign in to comment.