Skip to content

Commit

Permalink
Merge pull request #654 from tonlabs/d3p/new-endpoints
Browse files Browse the repository at this point in the history 
Update endpoints
  • Loading branch information
@SilkovAlexander
SilkovAlexander authored May 13, 2022
2 parents 4739f82 + 155a7e8 commit 1e1397b
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 34 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to this project will be documented in this file.

## Version: 0.26.6
## Version: 0.26.7

### New

Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ license = 'Apache-2.0'
name = 'tonos-cli'
readme = 'README.md'
repository = 'https://github.com/tonlabs/tonos-cli'
version = '0.26.6'
version = '0.26.7'

[dependencies]
async-trait = '0.1.42'
Expand Down
23 changes: 14 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,11 @@ Succeeded.
"async_call": false,
"debug_fail": "None",
"endpoints": [
"https://main2.ton.dev",
"https://main3.ton.dev",
"https://main4.ton.dev"
"https://eri01.main.everos.dev",
"https://gra01.main.everos.dev",
"https://gra02.main.everos.dev",
"https://lim01.main.everos.dev",
"https://rbx01.main.everos.dev"
]
}
```
Expand Down Expand Up @@ -370,13 +372,16 @@ Default state of the map:
```bash
{
"net.ton.dev": [
"https://net1.ton.dev",
"https://net5.ton.dev"
"https://eri01.net.everos.dev",
"https://rbx01.net.everos.dev"
"https://gra01.net.everos.dev"
],
"main.ton.dev": [
"https://main2.ton.dev",
"https://main3.ton.dev",
"https://main4.ton.dev"
"https://eri01.main.everos.dev",
"https://gra01.main.everos.dev",
"https://gra02.main.everos.dev",
"https://lim01.main.everos.dev",
"https://rbx01.main.everos.dev"
],
"http://127.0.0.1/": [
"http://0.0.0.0/",
Expand All @@ -397,7 +402,7 @@ Example:
```bash
tonos-cli config endpoint remove main.ton.dev
tonos-cli config endpoint add main.ton.dev "https://main2.ton.dev","https://main3.ton.dev","https://main4.ton.dev"
tonos-cli config endpoint add main.ton.dev "https://eri01.main.everos.dev","https://gra01.main.everos.dev","https://gra02.main.everos.dev","https://lim01.main.everos.dev","https://rbx01.main.everos.dev"
```
> **Note**: If url used in add command already exists, endpoints lists will be merged.
Expand Down
13 changes: 8 additions & 5 deletions src/config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,17 @@ impl Config {

lazy_static! {
static ref MAIN_ENDPOINTS: Vec<String> = vec![
"https://main2.ton.dev".to_string(),
"https://main3.ton.dev".to_string(),
"https://main4.ton.dev".to_string(),
"https://eri01.main.everos.dev".to_string(),
"https://gra01.main.everos.dev".to_string(),
"https://gra02.main.everos.dev".to_string(),
"https://lim01.main.everos.dev".to_string(),
"https://rbx01.main.everos.dev".to_string(),
];

static ref NET_ENDPOINTS: Vec<String> = vec![
"https://net1.ton.dev".to_string(),
"https://net5.ton.dev".to_string(),
"https://eri01.net.everos.dev".to_string(),
"https://rbx01.net.everos.dev".to_string(),
"https://gra01.net.everos.dev".to_string(),
];

static ref SE_ENDPOINTS: Vec<String> = vec![
Expand Down
32 changes: 17 additions & 15 deletions tests/cli.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ fn test_config_endpoints() -> Result<(), Box<dyn std::error::Error>> {
cmd.assert()
.success()
.stdout(predicate::str::contains("main.ton.dev"))
.stdout(predicate::str::contains("https://main2.ton.dev"))
.stdout(predicate::str::contains("https://rbx01.main.everos.dev"))
.stdout(predicate::str::contains("http://127.0.0.1/"))
.stdout(predicate::str::contains("net.ton.dev"))
.stdout(predicate::str::contains("https://net1.ton.dev"));
.stdout(predicate::str::contains("https://gra01.net.everos.dev"));

let mut cmd = Command::cargo_bin(BIN_NAME)?;
cmd.arg("config")
Expand All @@ -161,9 +161,11 @@ fn test_config_endpoints() -> Result<(), Box<dyn std::error::Error>> {
.success()
.stdout(predicate::str::contains(r#""url": "main.ton.dev","#))
.stdout(predicate::str::contains(r#""endpoints": [
"https://main2.ton.dev",
"https://main3.ton.dev",
"https://main4.ton.dev"
"https://eri01.main.everos.dev",
"https://gra01.main.everos.dev",
"https://gra02.main.everos.dev",
"https://lim01.main.everos.dev",
"https://rbx01.main.everos.dev"
]"#));

let mut cmd = Command::cargo_bin(BIN_NAME)?;
Expand All @@ -175,10 +177,10 @@ fn test_config_endpoints() -> Result<(), Box<dyn std::error::Error>> {
cmd.assert()
.success()
.stdout(predicate::str::contains("main.ton.dev"))
.stdout(predicate::str::contains("https://main2.ton.dev"))
.stdout(predicate::str::contains("https://rbx01.main.everos.dev"))
.stdout(predicate::str::contains("http://127.0.0.1/"))
.stdout(predicate::str::contains("net.ton.dev"))
.stdout(predicate::str::contains("https://net1.ton.dev"))
.stdout(predicate::str::contains("https://gra01.net.everos.dev"))
.stdout(predicate::str::contains("myownhost"))
.stdout(predicate::str::contains("1.1.1.1"))
.stdout(predicate::str::contains("my.net.com"));
Expand All @@ -204,10 +206,10 @@ fn test_config_endpoints() -> Result<(), Box<dyn std::error::Error>> {
cmd.assert()
.success()
.stdout(predicate::str::contains("main.ton.dev"))
.stdout(predicate::str::contains("https://main2.ton.dev"))
.stdout(predicate::str::contains("https://rbx01.main.everos.dev"))
.stdout(predicate::str::contains("http://127.0.0.1/"))
.stdout(predicate::str::contains("net.ton.dev"))
.stdout(predicate::str::contains("https://net1.ton.dev"))
.stdout(predicate::str::contains("https://gra01.net.everos.dev"))
.stdout(predicate::str::contains("myownhost"))
.stdout(predicate::str::contains("1.1.1.1"))
.stdout(predicate::str::contains("my.net.com"))
Expand All @@ -232,10 +234,10 @@ fn test_config_endpoints() -> Result<(), Box<dyn std::error::Error>> {
cmd.assert()
.success()
.stdout(predicate::function(|s: &str| !s.contains("main.ton.dev")))
.stdout(predicate::function(|s: &str| !s.contains("https://main2.ton.dev")))
.stdout(predicate::function(|s: &str| !s.contains("https://rbx01.main.everos.dev")))
.stdout(predicate::str::contains("http://127.0.0.1/"))
.stdout(predicate::str::contains("net.ton.dev"))
.stdout(predicate::str::contains("https://net1.ton.dev"))
.stdout(predicate::str::contains("https://gra01.net.everos.dev"))
.stdout(predicate::str::contains("myownhost"))
.stdout(predicate::str::contains("1.1.1.1"))
.stdout(predicate::str::contains("my.net.com"));
Expand All @@ -247,10 +249,10 @@ fn test_config_endpoints() -> Result<(), Box<dyn std::error::Error>> {
cmd.assert()
.success()
.stdout(predicate::function(|s: &str| !s.contains("main.ton.dev")))
.stdout(predicate::function(|s: &str| !s.contains("https://main2.ton.dev")))
.stdout(predicate::function(|s: &str| !s.contains("https://rbx01.main.everos.dev")))
.stdout(predicate::str::contains("http://127.0.0.1/"))
.stdout(predicate::str::contains("net.ton.dev"))
.stdout(predicate::str::contains("https://net1.ton.dev"))
.stdout(predicate::str::contains("https://gra01.net.everos.dev"))
.stdout(predicate::str::contains("myownhost"))
.stdout(predicate::str::contains("1.1.1.1"))
.stdout(predicate::str::contains("my.net.com"));
Expand All @@ -265,9 +267,9 @@ fn test_config_endpoints() -> Result<(), Box<dyn std::error::Error>> {
.stdout(predicate::function(|s: &str| !s.contains("my.net.com")))
.stdout(predicate::str::contains("http://127.0.0.1/"))
.stdout(predicate::str::contains("net.ton.dev"))
.stdout(predicate::str::contains("https://net1.ton.dev"))
.stdout(predicate::str::contains("https://gra01.net.everos.dev"))
.stdout(predicate::str::contains("main.ton.dev"))
.stdout(predicate::str::contains("https://main2.ton.dev"));
.stdout(predicate::str::contains("https://rbx01.main.everos.dev"));

let mut cmd = Command::cargo_bin(BIN_NAME)?;
cmd.arg("config")
Expand Down

0 comments on commit 1e1397b

Please sign in to comment.