Skip to content

[WIP] rm-serde #4

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.

Sign up for GitHub

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

Open
joshuaahuang wants to merge 2 commits into
base: rm-serde
Choose a base branch
from
Open

[WIP] rm-serde #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebeb032
Update JobNegotiation mining_job_token
Aug 2, 2022
34e0592
Merge pull request #191 from 4ss0/UpdateMiningJobToken
Fi3 Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions protocols/v2/roles-logic-sv2/src/parsers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ pub enum JobNegotiation<'a> {
#[cfg_attr(feature = "with_serde", serde(borrow))]
AllocateMiningJobToken(AllocateMiningJobToken<'a>),
#[cfg_attr(feature = "with_serde", serde(borrow))]
AllocateMiningJobTokenSuccess(AllocateMiningJobTokenSuccess<'a>),
AllocateMiningJobTokenSuccess(AllocateMiningJobTokenSuccess),
#[cfg_attr(feature = "with_serde", serde(borrow))]
CommitMiningJob(CommitMiningJob<'a>),
#[cfg_attr(feature = "with_serde", serde(borrow))]
CommitMiningJobSuccess(CommitMiningJobSuccess<'a>),
CommitMiningJobSuccess(CommitMiningJobSuccess),
#[cfg_attr(feature = "with_serde", serde(borrow))]
CommitMiningJobError(CommitMiningJobError<'a>),
IdentifyTransactions(IdentifyTransactions),
Expand Down
6 changes: 3 additions & 3 deletions protocols/v2/subprotocols/job-negotiation/src/allocate_mining_job.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use alloc::vec::Vec;
#[cfg(not(feature = "with_serde"))]
use binary_sv2::binary_codec_sv2;
use binary_sv2::{Deserialize, Serialize, Str0255, B0255};
use binary_sv2::{Deserialize, Serialize, Str0255};
use core::convert::TryInto;

/// # AllocateMiningJobToken(Client->Server)
Expand Down Expand Up @@ -30,14 +30,14 @@ pub struct AllocateMiningJobToken<'decoder> {
/// transaction outputs regularly, it should simply prefer to use the maximum of all such output
/// sizes as the coinbase_output_max_additional_size value.
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct AllocateMiningJobTokenSuccess<'decoder> {
pub struct AllocateMiningJobTokenSuccess {
/// Unique identifier for pairing the response.
pub request_id: u32,
/// Token that makes the client eligible for committing a mining job for
/// approval/transaction negotiation or for identifying custom mining job
/// on mining connection.
#[cfg_attr(feature = "with_serde", serde(borrow))]
pub mining_job_token: B0255<'decoder>,
pub mining_job_token: u32,
/// The maximum additional serialized bytes which the pool will add in
/// coinbase transaction outputs. See discussion in the Template
/// Distribution Protocol’s CoinbaseOutputDataSize message for more
Expand Down
4 changes: 2 additions & 2 deletions protocols/v2/subprotocols/job-negotiation/src/commit_mining_job.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub struct CommitMiningJob<'decoder> {

/// # CommitMiningJob.Success (Server->Client)
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct CommitMiningJobSuccess<'decoder> {
pub struct CommitMiningJobSuccess {
/// Identifier of the original request.
pub request_id: u32,
/// Unique identifier provided by the pool of the job that the Job Negotiator
Expand All @@ -76,7 +76,7 @@ pub struct CommitMiningJobSuccess<'decoder> {
/// message on each Mining Protocol client which wishes to mine using the
/// negotiated job.
#[cfg_attr(feature = "with_serde", serde(borrow))]
pub new_mining_job_token: B0255<'decoder>,
pub new_mining_job_token: u32,
}

/// # CommitMiningJob.Error (Server->Client)
Expand Down