Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 17:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix 2 minor build warning (#2260)

Browse source
This commit is contained in:
Gary Yu 2018-12-30 20:03:36 +08:00 committed by GitHub
parent 5e86cc8bb2
commit dbf8e97b3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/core/transaction.rs
View file

@ -18,7 +18,6 @@ use crate::consensus;
use crate::core::hash::Hashed; use crate::core::hash::Hashed;
use crate::core::verifier_cache::VerifierCache; use crate::core::verifier_cache::VerifierCache;
use crate::core::{committed, Committed}; use crate::core::{committed, Committed};
use crate::global;
use crate::keychain::{self, BlindingFactor}; use crate::keychain::{self, BlindingFactor};
use crate::ser::{ use crate::ser::{
self, read_multi, FixedLength, PMMRable, Readable, Reader, VerifySortedAndUnique, Writeable, self, read_multi, FixedLength, PMMRable, Readable, Reader, VerifySortedAndUnique, Writeable,
@ -29,7 +28,6 @@ use crate::util::secp;
use crate::util::secp::pedersen::{Commitment, RangeProof}; use crate::util::secp::pedersen::{Commitment, RangeProof};
use crate::util::static_secp_instance; use crate::util::static_secp_instance;
use crate::util::RwLock; use crate::util::RwLock;
use byteorder::{BigEndian, ByteOrder};
use std::cmp::max; use std::cmp::max;
use std::cmp::Ordering; use std::cmp::Ordering;
use std::collections::HashSet; use std::collections::HashSet;

5
servers/src/mining/stratumserver.rs
View file

@ -246,7 +246,7 @@ impl StratumServer {
verifier_cache: Arc<RwLock<dyn VerifierCache>>, verifier_cache: Arc<RwLock<dyn VerifierCache>>,
) -> StratumServer { ) -> StratumServer {
StratumServer { StratumServer {
id: String::from("StratumServer"), id: String::from("0"),
minimum_share_difficulty: config.minimum_share_difficulty, minimum_share_difficulty: config.minimum_share_difficulty,
config, config,
chain, chain,
@ -535,8 +535,9 @@ impl StratumServer {
worker_stats.num_blocks_found += 1; worker_stats.num_blocks_found += 1;
// Log message to make it obvious we found a block // Log message to make it obvious we found a block
warn!( warn!(
"(Server ID: {}) Solution Found for block {} - Yay!!! Worker ID: {}, blocks found: {}, shares: {}", "(Server ID: {}) Solution Found for block {}, hash {} - Yay!!! Worker ID: {}, blocks found: {}, shares: {}",
self.id, params.height, self.id, params.height,
b.hash(),
worker_stats.id, worker_stats.id,
worker_stats.num_blocks_found, worker_stats.num_blocks_found,
worker_stats.num_accepted, worker_stats.num_accepted,