Skip to content

Commit

Permalink
remove unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
@nkysg
nkysg committed Oct 27, 2023
1 parent e8cde15 commit 709fccf
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 218 deletions.
2 changes: 0 additions & 2 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions consensus/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ thiserror = { workspace = true }
proptest = { workspace = true }
proptest-derive = { workspace = true }
stest = { workspace = true }
serde = { features = ["derive"], workspace = true }
serde_json = { features = ["arbitrary_precision"], workspace = true }

[features]
default = []
Expand Down
214 changes: 1 addition & 213 deletions consensus/src/consensus_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,13 @@
use crate::consensus::Consensus;
use crate::difficulty::{get_next_target_helper, BlockDiffInfo};
use crate::{difficult_to_target, target_to_difficulty, G_CRYPTONIGHT};
use hex::FromHex;
use starcoin_crypto::hash::PlainCryptoHash;
use starcoin_crypto::HashValue;
use starcoin_time_service::{duration_since_epoch, MockTimeService, TimeService, TimeServiceType};
use starcoin_types::account_address::AccountAddress;
use starcoin_types::block::{
Block, BlockHeader, BlockHeaderBuilder, BlockHeaderExtra, RawBlockHeader,
};
use starcoin_types::block::{BlockHeader, BlockHeaderBuilder, BlockHeaderExtra, RawBlockHeader};
use starcoin_types::U256;
use starcoin_vm_types::genesis_config::ChainId;
use starcoin_vm_types::transaction::authenticator::AuthenticationKey;
use std::collections::VecDeque;

#[stest::test]
Expand Down Expand Up @@ -99,214 +95,6 @@ fn verify_header_test_barnard_block3_ubuntu22() {
.unwrap()
}

#[stest::test]
fn verify_header_test_barnard_block8_ubuntu22() {
let header = BlockHeader::new(
HashValue::from_hex_literal(
"0xc77be02f17ae90bdbca131ef535b0eab27c2824d76968bb88a0d04a60fba9698",
)
.unwrap(),
1616847045493,
8,
AccountAddress::from_hex_literal("0x94e957321e7bb2d3eb08ff6be81a6fcd").unwrap(),
HashValue::from_hex_literal(
"0xf7e83302d19fef31fa15d50be2dc0d311c376f44d8dbcebf6689f9c09790d33a",
)
.unwrap(),
HashValue::from_hex_literal(
"0x5f2696529b7c9c1777ec13d3c5c16425c5b60eb7de3fa85543db4127c86a4e8f",
)
.unwrap(),
HashValue::from_hex_literal(
"0x8c509c07e266d643f6a6422892ace3a414ee25cf5abd3ff056ff0138a6ab818e",
)
.unwrap(),
0,
0x06f6.into(),
HashValue::from_hex_literal(
"0xc01e0329de6d899348a8ef4bd51db56175b3fa0988e57c3dcec8eaf13a164d97",
)
.unwrap(),
ChainId::new(251),
62493013,
BlockHeaderExtra::new([0u8; 4]),
);
G_CRYPTONIGHT
.verify_header_difficulty(header.difficulty(), &header)
.unwrap()
}

#[stest::test]
fn verify_header_test_barnard_block11_ubuntu22() {
let str = r#"{"header":{"parent_hash":"0x1594ff26c83602d29f4f446b8827def0aaea10964412618e25dc02f06e91c21a","timestamp":1616847050800,"number":11,"author":"0x94e957321e7bb2d3eb08ff6be81a6fcd","author_auth_key":null,"txn_accumulator_root":"0xaea9459d60a2c25fce465869fe88d7d15a5e9e56c9518455f01fdbf22f7f05c3","block_accumulator_root":"0x102beaa7ab8bd547afaf0f9c2a1b2c41fbc29d9b6dfac42f970dabf9ea129ad7","state_root":"0xa7aaeaf9099e11a461d90d1706ba726c9c3328319ae0de9bcb5e9ae5f1d40ec8","gas_used":0,"difficulty":"0x0820","body_hash":"0xc01e0329de6d899348a8ef4bd51db56175b3fa0988e57c3dcec8eaf13a164d97","chain_id":{"id":251},"nonce":3483627898,"extra":"0x00000000"},"body":{"transactions":[],"uncles":null}}
"#;
let block: Block = serde_json::from_str(str).unwrap();
let header = block.header;
G_CRYPTONIGHT
.verify_header_difficulty(header.difficulty(), &header)
.unwrap()
}

#[stest::test]
fn verify_header_test_barnard_block15_ubuntu22() {
let str = r#"{"header":{"parent_hash":"0xe86f4da17a882f96d8ec03e878d166b11944a80a82fc5511c375afd56a92819d","timestamp":1616847060281,"number":15,"author":"0x94e957321e7bb2d3eb08ff6be81a6fcd","author_auth_key":null,"txn_accumulator_root":"0xdd61351d53918a907f6fd63f88ca1301ff992b3240b6a4ac8337771c1f52a621","block_accumulator_root":"0xb5656d0bd8620bfa54467579b910a3ba99a9394fc4b345c935da2f1173b5822f","state_root":"0xf3e53c627616e5b79a588e51692679b2e487d2c71c61b037cfc0854b43dfe0b1","gas_used":0,"difficulty":"0x0976","body_hash":"0xc01e0329de6d899348a8ef4bd51db56175b3fa0988e57c3dcec8eaf13a164d97","chain_id":{"id":251},"nonce":37678194,"extra":"0x00000000"},"body":{"transactions":[],"uncles":null}}"#;
let block: Block = serde_json::from_str(str).unwrap();
let header = block.header;
G_CRYPTONIGHT
.verify_header_difficulty(header.difficulty(), &header)
.unwrap()
}

#[stest::test]
fn verify_header_test_main_block2_ubuntu22() {
let input = "38e115d617f293f23ae8d951330e97a3000dc78e982dcdc5c80246f76d2140aa";
let auth_key = <[u8; AuthenticationKey::LENGTH]>::from_hex(input).unwrap();
let header = BlockHeader::new_with_auth_key(
HashValue::from_hex_literal(
"0xc2ce2515f48a2ffef2e69b0288bb2aa78c8bfa9a55312eb948758702cd55f805",
)
.unwrap(),
1621311561476,
2,
AccountAddress::from_hex_literal("0x000dc78e982dcdc5c80246f76d2140aa").unwrap(),
Some(AuthenticationKey::new(auth_key)),
HashValue::from_hex_literal(
"0x40e0bb9454a40a6a2dd0579a60557c419bec995dfd80a81452a2fe0cd344ec1d",
)
.unwrap(),
HashValue::from_hex_literal(
"0xe2d703b76eb066b4453eb6b05f90f9fe498d85afbafc97110cc946702bf10459",
)
.unwrap(),
HashValue::from_hex_literal(
"0xa4be7b3d401da8ed15f7c4fa7c06a7cd25815f246b62fb0e7f05f32a59739c89",
)
.unwrap(),
0,
11660343.into(),
HashValue::from_hex_literal(
"0xc01e0329de6d899348a8ef4bd51db56175b3fa0988e57c3dcec8eaf13a164d97",
)
.unwrap(),
ChainId::new(1),
3221282425,
BlockHeaderExtra::new([0u8; 4]),
);
G_CRYPTONIGHT
.verify_header_difficulty(header.difficulty(), &header)
.unwrap()
}

#[stest::test]
fn verify_header_test_main_block3_ubuntu22() {
let header = BlockHeader::new(
HashValue::from_hex_literal(
"0xdda5d70eac37fa646fd9cebb274acf98fba78ff1e8afeb8b4ac11a1d90ffc84c",
)
.unwrap(),
1621311660684,
3,
AccountAddress::from_hex_literal("0x34e2fd022578411aa8c249f8dc1da714").unwrap(),
HashValue::from_hex_literal(
"0xe1de0056ff0d4ff61927ed33b8a82bc4cff48c3a2eedea359d1359009cd40c45",
)
.unwrap(),
HashValue::from_hex_literal(
"0x2d349fee1bb6e95279dad8879023cc09abd4e809e24cd31390a30e69b23c01ed",
)
.unwrap(),
HashValue::from_hex_literal(
"0xecff23fdef37e2b4899ac78433349322518a0d08d1208bb50e5ac42ffebf3730",
)
.unwrap(),
0,
0x58f61b.into(),
HashValue::from_hex_literal(
"0xc01e0329de6d899348a8ef4bd51db56175b3fa0988e57c3dcec8eaf13a164d97",
)
.unwrap(),
ChainId::new(1),
1124080139,
BlockHeaderExtra::new([0u8; 4]),
);
G_CRYPTONIGHT
.verify_header_difficulty(header.difficulty(), &header)
.unwrap()
}

#[stest::test]
fn verify_header_test_main_block9_ubuntu22() {
let header = BlockHeader::new(
HashValue::from_hex_literal(
"0xb0b15a141aebf12c7627650d1073eaf16f3ca6cdedc749e3538c67f5718b248f",
)
.unwrap(),
1621311699164,
9,
AccountAddress::from_hex_literal("0x34e2fd022578411aa8c249f8dc1da714").unwrap(),
HashValue::from_hex_literal(
"0x2b6a7f74848f46047e551c420c3f67fb14dee3a2a9e179f0574e4a875d23957a",
)
.unwrap(),
HashValue::from_hex_literal(
"0x69221d1fa562141bd37989a55d550eef14818906bcf3d8d371a763ae1404d449",
)
.unwrap(),
HashValue::from_hex_literal(
"0x2f21429f091791ec677d224deb704ee83be415abe4338d98b9ce974b72d0b128",
)
.unwrap(),
0,
0x2395a4.into(),
HashValue::from_hex_literal(
"0xc01e0329de6d899348a8ef4bd51db56175b3fa0988e57c3dcec8eaf13a164d97",
)
.unwrap(),
ChainId::new(1),
1711277746,
BlockHeaderExtra::new([0u8; 4]),
);
G_CRYPTONIGHT
.verify_header_difficulty(header.difficulty(), &header)
.unwrap()
}
#[stest::test]
fn verify_header_test_main_block10_ubuntu22() {
let header = BlockHeader::new(
HashValue::from_hex_literal(
"0x34e51fcc0435a6c9f21d13c05281d37103e0aa684ebec5d8b03c0acaa3421b57",
)
.unwrap(),
1621311702957,
10,
AccountAddress::from_hex_literal("0x34e2fd022578411aa8c249f8dc1da714").unwrap(),
HashValue::from_hex_literal(
"0x81feec936ed7c20f64d7d636c1d8abeee67df79ae77fbac4a1e0e34d5bfc0222",
)
.unwrap(),
HashValue::from_hex_literal(
"0xe2e31f07c7a00b4eae270f746516790e7000d8f49540b4fef3216339fef5035a",
)
.unwrap(),
HashValue::from_hex_literal(
"0x842e4affbb7b1a897fd7f8649f34a67a07bd26c1a063d942b608296f03e04163",
)
.unwrap(),
0,
0x20597d.into(),
HashValue::from_hex_literal(
"0xc01e0329de6d899348a8ef4bd51db56175b3fa0988e57c3dcec8eaf13a164d97",
)
.unwrap(),
ChainId::new(1),
1957359399,
BlockHeaderExtra::new([0u8; 4]),
);
G_CRYPTONIGHT
.verify_header_difficulty(header.difficulty(), &header)
.unwrap()
}

fn simulate_blocks(time_plan: u64, init_difficulty: U256) -> u64 {
fn liner_hash_pow(difficulty: U256, current: u64) -> u64 {
let ts = MockTimeService::new_with_value(current);
Expand Down
2 changes: 1 addition & 1 deletion types/src/block.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ impl BlockHeader {
}

// the author_auth_key field is deprecated, but keep this fn for compat with old block.
pub fn new_with_auth_key(
fn new_with_auth_key(
parent_hash: HashValue,
timestamp: u64,
number: BlockNumber,
Expand Down

0 comments on commit 709fccf

Please sign in to comment.