@@ -1425,11 +1425,10 @@ impl Signer {
1425
1425
} ) ;
1426
1426
if total_reject_weight. saturating_add ( min_weight) <= total_weight {
1427
1427
// Not enough rejection signatures to make a decision
1428
- let reject_threshold = total_weight. saturating_sub ( min_weight) . saturating_add ( 1 ) ;
1429
1428
info ! ( "{self}: Received block rejection" ;
1430
- "signer_pubkey" => public_key,
1431
- "signer_signature_hash" => block_hash,
1432
- "consensus_hash" => block_info. block. header. consensus_hash,
1429
+ "signer_pubkey" => public_key. to_hex ( ) ,
1430
+ "signer_signature_hash" => % block_hash,
1431
+ "consensus_hash" => % block_info. block. header. consensus_hash,
1433
1432
"block_height" => block_info. block. header. chain_length,
1434
1433
"reject_reason" => ?rejection. response_data. reject_reason,
1435
1434
"total_weight_rejected" => total_reject_weight,
@@ -1439,9 +1438,9 @@ impl Signer {
1439
1438
return ;
1440
1439
}
1441
1440
info ! ( "{self}: Received block rejection and have reached the rejection threshold" ;
1442
- "signer_pubkey" => public_key,
1443
- "signer_signature_hash" => block_hash,
1444
- "consensus_hash" => block_info. block. header. consensus_hash,
1441
+ "signer_pubkey" => public_key. to_hex ( ) ,
1442
+ "signer_signature_hash" => % block_hash,
1443
+ "consensus_hash" => % block_info. block. header. consensus_hash,
1445
1444
"block_height" => block_info. block. header. chain_length,
1446
1445
"reject_reason" => ?rejection. response_data. reject_reason,
1447
1446
"total_weight_rejected" => total_reject_weight,
@@ -1565,24 +1564,24 @@ impl Signer {
1565
1564
1566
1565
if min_weight > signature_weight {
1567
1566
info ! ( "{self}: Received block acceptance" ;
1568
- "signer_pubkey" => public_key,
1569
- "signer_signature_hash" => block_hash,
1570
- "consensus_hash" => block_info. block. header. consensus_hash,
1567
+ "signer_pubkey" => public_key. to_hex ( ) ,
1568
+ "signer_signature_hash" => % block_hash,
1569
+ "consensus_hash" => % block_info. block. header. consensus_hash,
1571
1570
"block_height" => block_info. block. header. chain_length,
1572
- "total_weight_approved" => total_weight_approved ,
1571
+ "total_weight_approved" => signature_weight ,
1573
1572
"total_weight" => total_weight,
1574
- "percent_approved" => ( total_weight_approved as f64 / total_weight as f64 * 100.0 ) ,
1573
+ "percent_approved" => ( signature_weight as f64 / total_weight as f64 * 100.0 ) ,
1575
1574
) ;
1576
1575
return ;
1577
1576
}
1578
1577
info ! ( "{self}: Received block acceptance and have reached the threshold" ;
1579
- "signer_pubkey" => public_key,
1580
- "signer_signature_hash" => block_hash,
1581
- "consensus_hash" => block_info. block. header. consensus_hash,
1578
+ "signer_pubkey" => public_key. to_hex ( ) ,
1579
+ "signer_signature_hash" => % block_hash,
1580
+ "consensus_hash" => % block_info. block. header. consensus_hash,
1582
1581
"block_height" => block_info. block. header. chain_length,
1583
- "total_weight_approved" => total_weight_approved ,
1582
+ "total_weight_approved" => signature_weight ,
1584
1583
"total_weight" => total_weight,
1585
- "percent_approved" => ( total_weight_approved as f64 / total_weight as f64 * 100.0 ) ,
1584
+ "percent_approved" => ( signature_weight as f64 / total_weight as f64 * 100.0 ) ,
1586
1585
) ;
1587
1586
1588
1587
// have enough signatures to broadcast!
0 commit comments