Add flitering of versions. #18

Darth-Ness · 2022-10-27T23:31:38Z

Unfortunately, I wasn't able to confirm it works. It does at least compile without errors. Let me know if you want me to change anything.

tbrand · 2022-10-28T07:13:53Z

As I wrote in #13, you have to define --min-version arg frst.
Also, you shouldn't filtering the nodes by while (here) but you should do it in the iterator here

Darth-Ness · 2022-10-28T13:41:58Z

As I wrote in #13, you have to define --min-version arg frst. Also, you shouldn't filtering the nodes by while (here) but you should do it in the iterator here

Okay, it now uses the filter method instead of a while loop.

tbrand · 2022-10-28T14:24:08Z

Cool!

Avoid parsing args again here but pass it as arg.
Is this correct? It seems the opposite.

Please create a latest docker-compose environment to confirm the implementation! Only you have to do is download the latest docker-compose binary here.

Darth-Ness · 2022-10-28T22:57:50Z

Do you mean the operator I used? If so I think it correct.

Darth-Ness · 2022-10-28T23:46:38Z

sudo ./docker-compose-linux-armv7 build outputs

ERROR [negy-negy-node1 internal] load metadata for docker.io/library/debian:buster-slim

tbrand · 2022-10-28T23:50:30Z

https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.filter
true elements will be remaining. so it should be n.version >= min_version

negy-gateway/src/main.rs

tbrand · 2022-10-30T03:24:23Z

negy-gateway/src/main.rs

@@ -55,6 +58,14 @@ async fn fetch_nodes_unselected(node_pool_endpoint: &str) -> Result<Vec<NodeUnse
            name: n.name,
            version: n.version,
        })
+        .filter(|n| {
+           if let Some(min_version) = &args.min_version {
+                n.version.parse::<i32>().unwrap() >= min_version.parse::<i32>().unwrap()


Don't parse as i32 but add semver crate and parse as Version. https://docs.rs/semver/latest/semver/

negy-gateway/src/main.rs

Darth-Ness · 2022-10-30T21:18:44Z

Should I focus on resolving the conflict now?

tbrand · 2022-10-31T03:55:35Z

Sure!

Darth-Ness · 2022-10-31T10:46:21Z

Okay, I got the conflict resolved.

tbrand · 2022-10-31T12:42:59Z

Nice! The last thing you have to do it add semver create as I wrote.

negy-gateway/src/main.rs

Darth-Ness · 2022-10-31T22:40:07Z

Okay empty lines removed.

tbrand · 2022-10-31T22:42:29Z

Thxs. Please add semver crate as I mentioned.

Darth-Ness · 2022-10-31T23:35:59Z

All right, it now uses the semver crate.

tbrand · 2022-11-01T01:43:03Z

negy-gateway/src/main.rs

 ) -> Result<()> {
+


empty line added

tbrand · 2022-11-01T01:43:15Z

negy-gateway/src/main.rs

@@ -124,11 +135,13 @@ async fn main() -> Result<()> {

    let listener = TcpListener::bind(bind_addr).await?;

+


empty line added

tbrand · 2022-11-01T01:43:42Z

negy-gateway/src/main.rs

@@ -24,6 +25,8 @@ struct Args {
    hops: usize,
    #[clap(short, long, value_parser)]
    auth_token: Option<String>,
+    min_version: Option<String>,
+


empty line added

tbrand · 2022-11-01T01:44:41Z

Looks good!! After you removing the empty lines, I gonna merge this!

Darth-Ness · 2022-11-01T10:37:34Z

Hang on, I forgot to update the cargo files, let me do that before you merge.

Darth-Ness · 2022-11-01T10:49:33Z

Okay got those updated, and empty lines removed.

tbrand · 2022-11-01T10:54:40Z

Yup. thanks

tbrand · 2022-11-01T11:00:22Z

I think you need to add semver both of /Cargo.toml and /negy-gateway/Cargo.toml. Please confirm your code could be compiled and run successfully. Also, please do not commit any changes which is meaningless in this pull request. Like adding empty lines and removing existing codes. Thanks.

Darth-Ness · 2022-11-01T11:08:29Z

I did fix that one file. Not sure why that happened. And yes, cargo run in the negy-gateway directory work just fine

tbrand · 2022-11-01T12:56:19Z

Hey @Darth-Ness, I would like to finish this PR for the next release so I created a new PR to fix this. #22
All of your commits are in it. If it's ok, I would like to merge #22. How does it sound?

Darth-Ness · 2022-11-01T13:41:46Z

Hey @Darth-Ness, I would like to finish this PR for the next release so I created a new PR to fix this. #22 All of your commits are in it. If it's ok, I would like to merge #22. How does it sound?

That's good, go ahead and merge it whenever your ready. Do you want me to close this?
By the way, when some one makes a PR to one of your repos, you can directly commit to the branch the new commits are coming from (Unless that is turned off)

tbrand · 2022-11-01T16:44:43Z

I merged this! Thanks for the contribution!! 🎉 Your name will be listed.

Add flitering of versions.

0c80fb1

Darth-Ness added 2 commits October 28, 2022 11:38

Add code I forgot from local version

1a3428b

Use the fliter method instead of while loop

b56068d

Fix operator issue.

b04cab4

tbrand requested changes Oct 29, 2022

View reviewed changes

negy-gateway/src/main.rs Outdated Show resolved Hide resolved

Use option

f6a61ad

tbrand requested changes Oct 30, 2022

View reviewed changes

Pass args from main function.

c215c6c

Merge branch 'dev' into dev

50db82b

tbrand reviewed Oct 31, 2022

View reviewed changes

negy-gateway/src/main.rs Outdated Show resolved Hide resolved

negy-gateway/src/main.rs Outdated Show resolved Hide resolved

negy-gateway/src/main.rs Outdated Show resolved Hide resolved

Remove superfluous empty lines.

69c064e

Use semver crate.

dd9c407

Darth-Ness requested a review from tbrand November 1, 2022 00:15

tbrand reviewed Nov 1, 2022

View reviewed changes

Remove empty lines again

1afcc8b

Darth-Ness added 2 commits November 1, 2022 10:44

Update Cargo.lock

c597076

Add semver dependency.

2ca288d

Fix Cargo.toml

6623c08

Darth-Ness requested a review from tbrand November 1, 2022 12:44

tbrand mentioned this pull request Nov 1, 2022

Fix min version by @Darth-Ness #22

Merged

tbrand mentioned this pull request Nov 1, 2022

Draft: Version 0.1.1 #20

Closed

tbrand merged commit 6623c08 into negyio:dev Nov 1, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add flitering of versions. #18

Add flitering of versions. #18

Darth-Ness commented Oct 27, 2022

tbrand commented Oct 28, 2022

Darth-Ness commented Oct 28, 2022

tbrand commented Oct 28, 2022

Darth-Ness commented Oct 28, 2022

Darth-Ness commented Oct 28, 2022

tbrand commented Oct 28, 2022

tbrand Oct 30, 2022

Darth-Ness commented Oct 30, 2022

tbrand commented Oct 31, 2022

Darth-Ness commented Oct 31, 2022

tbrand commented Oct 31, 2022

Darth-Ness commented Oct 31, 2022

tbrand commented Oct 31, 2022 •

edited

Darth-Ness commented Oct 31, 2022

tbrand Nov 1, 2022

tbrand Nov 1, 2022

tbrand Nov 1, 2022

tbrand commented Nov 1, 2022

Darth-Ness commented Nov 1, 2022

Darth-Ness commented Nov 1, 2022

tbrand commented Nov 1, 2022

tbrand commented Nov 1, 2022

Darth-Ness commented Nov 1, 2022

tbrand commented Nov 1, 2022 •

edited

Darth-Ness commented Nov 1, 2022 •

edited

tbrand commented Nov 1, 2022

		@@ -124,11 +135,13 @@ async fn main() -> Result<()> {

		let listener = TcpListener::bind(bind_addr).await?;

Add flitering of versions. #18

Add flitering of versions. #18

Conversation

Darth-Ness commented Oct 27, 2022

tbrand commented Oct 28, 2022

Darth-Ness commented Oct 28, 2022

tbrand commented Oct 28, 2022

Darth-Ness commented Oct 28, 2022

Darth-Ness commented Oct 28, 2022

tbrand commented Oct 28, 2022

tbrand Oct 30, 2022

Choose a reason for hiding this comment

Darth-Ness commented Oct 30, 2022

tbrand commented Oct 31, 2022

Darth-Ness commented Oct 31, 2022

tbrand commented Oct 31, 2022

Darth-Ness commented Oct 31, 2022

tbrand commented Oct 31, 2022 • edited

Darth-Ness commented Oct 31, 2022

tbrand Nov 1, 2022

Choose a reason for hiding this comment

tbrand Nov 1, 2022

Choose a reason for hiding this comment

tbrand Nov 1, 2022

Choose a reason for hiding this comment

tbrand commented Nov 1, 2022

Darth-Ness commented Nov 1, 2022

Darth-Ness commented Nov 1, 2022

tbrand commented Nov 1, 2022

tbrand commented Nov 1, 2022

Darth-Ness commented Nov 1, 2022

tbrand commented Nov 1, 2022 • edited

Darth-Ness commented Nov 1, 2022 • edited

tbrand commented Nov 1, 2022

tbrand commented Oct 31, 2022 •

edited

tbrand commented Nov 1, 2022 •

edited

Darth-Ness commented Nov 1, 2022 •

edited