Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Stratum up #4233

Merged
merged 72 commits into from
Jan 25, 2017
Merged

Stratum up #4233

merged 72 commits into from
Jan 25, 2017

Conversation

NikVolf
Copy link
Contributor

@NikVolf NikVolf commented Jan 20, 2017

io: io,
proto: self,
}, &unfulfilled)
let unfulfilled = match self.peers.write().remove(&peer) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is also part of #4285 pr

@@ -114,7 +114,7 @@ extern crate heapsize;
#[macro_use]
extern crate ethcore_ipc as ipc;
extern crate lru_cache;

extern crate ethcore_stratum;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this and lru_cache should be in the section with the other non-#[macro_use] crates.

JobDispatcher, PushWorkHandler,
Stratum as StratumService, Error as StratumServiceError,
};
use super::StratumOptions;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not declare it here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there was a conditional compilation previously, now yes, why not

let dispatcher = Arc::new(StratumJobDispatcher::new(miner, client));

let stratum_svc = StratumService::start(
&SocketAddr::from_str(&format!("{}:{}", options.listen_addr, options.port))?,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

StratumOptions should just contain a SocketAddr rather than do the conversion in the start function

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

port and listen address are configured separately all over the configuration code
https://github.com/ethcore/parity/blob/master/parity/configuration.rs

but the SocketAddr instantiation should not be done via string, yes

@rphmeier rphmeier added A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jan 24, 2017
@rphmeier
Copy link
Contributor

couple more style nits but otherwise all LGTM!

@NikVolf NikVolf added A0-pleasereview 🤓 Pull request needs code review. and removed A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. labels Jan 24, 2017
@gavofyork gavofyork added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jan 25, 2017
@gavofyork gavofyork merged commit 1acc803 into master Jan 25, 2017
@gavofyork gavofyork deleted the stratum-up branch January 25, 2017 10:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants