-
Notifications
You must be signed in to change notification settings - Fork 255
feat: convert merge mining tests from RandomX-Monero to RandomX-Tari #7742
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: development
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -90,7 +90,7 @@ impl BlockTemplateManager<'_> { | |||||
| let block = match self.p2pool_client.as_mut() { | ||||||
| Some(client) => { | ||||||
| let pow_algo = PowAlgo { | ||||||
| pow_algo: PowAlgos::Randomxm.into(), | ||||||
| pow_algo: PowAlgos::Randomxt.into(), | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Switching the proof-of-work algorithm from
Suggested change
|
||||||
| }; | ||||||
| let coinbase_extra = if self.config.coinbase_extra.trim().is_empty() { | ||||||
| String::new() | ||||||
|
|
@@ -211,7 +211,7 @@ impl BlockTemplateManager<'_> { | |||||
| .base_node_client | ||||||
| .get_new_block_template(grpc::NewBlockTemplateRequest { | ||||||
| algo: Some(grpc::PowAlgo { | ||||||
| pow_algo: grpc::pow_algo::PowAlgos::Randomxm.into(), | ||||||
| pow_algo: grpc::pow_algo::PowAlgos::Randomxt.into(), | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As noted previously, changing the algorithm to
Suggested change
|
||||||
| }), | ||||||
| max_weight: 0, | ||||||
| }) | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -201,7 +201,7 @@ pub async fn start_merge_miner(cli: Cli) -> Result<(), anyhow::Error> { | |||||
| async fn verify_base_node_responses(node_conn: &mut BaseNodeGrpcClient) -> Result<(), MmProxyError> { | ||||||
| if let Err(e) = verify_base_node_grpc_mining_responses(node_conn, grpc::NewBlockTemplateRequest { | ||||||
| algo: Some(grpc::PowAlgo { | ||||||
| pow_algo: grpc::pow_algo::PowAlgos::Randomxm.into(), | ||||||
| pow_algo: grpc::pow_algo::PowAlgos::Randomxt.into(), | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The verification of base node responses should remain consistent with the intended merge mining algorithm (
Suggested change
|
||||||
| }), | ||||||
| max_weight: 0, | ||||||
| }) | ||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The test data should reflect the correct algorithm for merge mining, which is
Randomxm. UsingRandomxthere aligns with the incorrect change in the production code.