From 2524168a0e81278dc6e1113618fc86a7ccedf376 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Sat, 6 Aug 2022 05:49:52 +0000 Subject: [PATCH] move dev to different ports --- .env | 2 +- README.md | 2 +- docker-compose.yml | 4 ++-- web3_proxy/src/bin/web3_proxy.rs | 4 ++-- web3_proxy/src/bin/web3_proxy_cli/main.rs | 2 +- web3_proxy/src/frontend/mod.rs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.env b/.env index 99bf8a89..e9f9714b 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -DATABASE_URL=mysql://root:dev_web3_proxy@127.0.0.1:3306/web3_proxy +DATABASE_URL=mysql://root:dev_web3_proxy@127.0.0.1:13306/dev_web3_proxy diff --git a/README.md b/README.md index 91b39505..29e094ee 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ You can copy `config/example.toml` to `config/production-$CHAINNAME.toml` and th Types for database entities are generated from a development database. ``` -sea-orm-cli generate entity -u mysql://root:dev_web3_proxy@127.0.0.1:3306/dev_web3_proxy -o entities/src +sea-orm-cli generate entity -u mysql://root:dev_web3_proxy@127.0.0.1:13306/dev_web3_proxy -o entities/src ``` Then manually fix some columns: `Vec` -> `sea_orm::prelude::Uuid` and `i8` -> `bool`. Related: diff --git a/docker-compose.yml b/docker-compose.yml index 85087ae6..927e6c13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: dev-redis: build: ./redis-cell-server/ ports: - - 127.0.0.1:6379:6379 + - 127.0.0.1:16379:6379 # TODO: expose these ports? dev-db: @@ -15,7 +15,7 @@ services: MYSQL_ROOT_PASSWORD: dev_web3_proxy MYSQL_DATABASE: dev_web3_proxy ports: - - 127.0.0.1:3306:3306 + - 127.0.0.1:13306:3306 volumes: - ./data/dev_mysql:/var/lib/mysql diff --git a/web3_proxy/src/bin/web3_proxy.rs b/web3_proxy/src/bin/web3_proxy.rs index ae6222cf..f1c424e0 100644 --- a/web3_proxy/src/bin/web3_proxy.rs +++ b/web3_proxy/src/bin/web3_proxy.rs @@ -1,4 +1,4 @@ -//! Web3-proxy is a fast caching and load balancing proxy for web3 (Ethereum or similar) JsonRPC servers. +//! Web3_proxy is a fast caching and load balancing proxy for web3 (Ethereum or similar) JsonRPC servers. //! //! Signed transactions (eth_sendRawTransaction) are sent in parallel to the configured private RPCs (eden, ethermine, flashbots, etc.). //! @@ -131,7 +131,7 @@ fn main() -> anyhow::Result<()> { let app_config: AppConfig = toml::from_str(&app_config)?; // TODO: this doesn't seem to do anything - proctitle::set_title(format!("web3-proxy-{}", app_config.shared.chain_id)); + proctitle::set_title(format!("web3_proxy-{}", app_config.shared.chain_id)); let (_shutdown_sender, shutdown_receiver) = flume::bounded(1); diff --git a/web3_proxy/src/bin/web3_proxy_cli/main.rs b/web3_proxy/src/bin/web3_proxy_cli/main.rs index ac269e4d..0ed4c2d6 100644 --- a/web3_proxy/src/bin/web3_proxy_cli/main.rs +++ b/web3_proxy/src/bin/web3_proxy_cli/main.rs @@ -11,7 +11,7 @@ pub struct TopConfig { /// what database the client should connect to #[argh( option, - default = "\"mysql://root:dev_web3_proxy@127.0.0.1:3306/dev_web3_proxy\".to_string()" + default = "\"mysql://root:dev_web3_proxy@127.0.0.1:13306/dev_web3_proxy\".to_string()" )] pub db_url: String, diff --git a/web3_proxy/src/frontend/mod.rs b/web3_proxy/src/frontend/mod.rs index 5afb881e..6847e85f 100644 --- a/web3_proxy/src/frontend/mod.rs +++ b/web3_proxy/src/frontend/mod.rs @@ -1,4 +1,4 @@ -/// this should move into web3-proxy once the basics are working +/// this should move into web3_proxy once the basics are working mod errors; mod http; mod http_proxy;