Skip to content

Commit 1a774ea

Browse files
committed
Adapt some of the tests to Blackcoin
1 parent ad12692 commit 1a774ea

File tree

2 files changed

+41
-42
lines changed

2 files changed

+41
-42
lines changed

bitcoin/src/address/mod.rs

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ impl Address {
638638
/// # })().unwrap();
639639
/// # assert_eq!(writer, ADDRESS);
640640
/// ```
641-
pub fn to_qr_uri(&self) -> String { format!("bitcoin:{:#}", self) }
641+
pub fn to_qr_uri(&self) -> String { format!("blackcoin:{:#}", self) }
642642

643643
/// Returns true if the given pubkey is directly related to the address payload.
644644
///
@@ -877,29 +877,29 @@ mod tests {
877877
fn test_p2pkh_address_58() {
878878
let addr = Address::new(
879879
Bitcoin,
880-
Payload::PubkeyHash("162c5ea71c0b23f5b9022ef047c4a86470a5b070".parse().unwrap()),
880+
Payload::PubkeyHash("0f3d16a50264456bbc771f40b36fefe69d30dc05".parse().unwrap()),
881881
);
882882

883883
assert_eq!(
884884
addr.script_pubkey(),
885-
ScriptBuf::from_hex("76a914162c5ea71c0b23f5b9022ef047c4a86470a5b07088ac").unwrap()
885+
ScriptBuf::from_hex("76a9140f3d16a50264456bbc771f40b36fefe69d30dc0588ac").unwrap()
886886
);
887-
assert_eq!(&addr.to_string(), "132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM");
887+
assert_eq!(&addr.to_string(), "B5qew6MwFjfH3fqNCb2eqbbMbRmaN67MD3");
888888
assert_eq!(addr.address_type(), Some(AddressType::P2pkh));
889889
roundtrips(&addr);
890890
}
891891

892892
#[test]
893893
fn test_p2pkh_from_key() {
894-
let key = "048d5141948c1702e8c95f438815794b87f706a8d4cd2bffad1dc1570971032c9b6042a0431ded2478b5c9cf2d81c124a5e57347a3c63ef0e7716cf54d613ba183".parse::<PublicKey>().unwrap();
894+
let key = "04178abe9710e08f04b423be5a90c2b8d6987697dc53c0f2958e64e3d893fcc7c51ecdc85e997eec2c73cdcc21f70e3f3601d100fbb1f3275c48b65a519e327827".parse::<PublicKey>().unwrap();
895895
let addr = Address::p2pkh(&key, Bitcoin);
896-
assert_eq!(&addr.to_string(), "1QJVDzdqb1VpbDK7uDeyVXy9mR27CJiyhY");
896+
assert_eq!(&addr.to_string(), "BHbXiw6Zvezk7pYYwbKyPrgprFkHLggcn1");
897897

898-
let key = "03df154ebfcf29d29cc10d5c2565018bce2d9edbab267c31d2caf44a63056cf99f"
898+
let key = "0378c706a3c41ef40aff9e503d6e1410d62a9833512e1d38f30905c11e707e93ba"
899899
.parse::<PublicKey>()
900900
.unwrap();
901901
let addr = Address::p2pkh(&key, Testnet);
902-
assert_eq!(&addr.to_string(), "mqkhEMH6NCeYjFybv7pvFC22MFeaNT9AQC");
902+
assert_eq!(&addr.to_string(), "n3vpYCTpWg4Bw7k3tW3KTwAEnCcVmBDMbx");
903903
assert_eq!(addr.address_type(), Some(AddressType::P2pkh));
904904
roundtrips(&addr);
905905
}
@@ -908,14 +908,14 @@ mod tests {
908908
fn test_p2sh_address_58() {
909909
let addr = Address::new(
910910
Bitcoin,
911-
Payload::ScriptHash("162c5ea71c0b23f5b9022ef047c4a86470a5b070".parse().unwrap()),
911+
Payload::ScriptHash("fc7d8105ebd93eddc1a1a5b5af26a049cb14d58e".parse().unwrap()),
912912
);
913913

914914
assert_eq!(
915915
addr.script_pubkey(),
916-
ScriptBuf::from_hex("a914162c5ea71c0b23f5b9022ef047c4a86470a5b07087").unwrap(),
916+
ScriptBuf::from_hex("a914fc7d8105ebd93eddc1a1a5b5af26a049cb14d58e87").unwrap(),
917917
);
918-
assert_eq!(&addr.to_string(), "33iFwdLuRpW1uK1RTRqsoi8rR4NpDzk66k");
918+
assert_eq!(&addr.to_string(), "bbkKKk2GT6wB5Qmpgtdd3gCnnsykXfD8Qu");
919919
assert_eq!(addr.address_type(), Some(AddressType::P2sh));
920920
roundtrips(&addr);
921921
}
@@ -966,12 +966,11 @@ mod tests {
966966

967967
#[test]
968968
fn test_p2shwpkh() {
969-
// stolen from Bitcoin transaction: ad3fd9c6b52e752ba21425435ff3dd361d6ac271531fc1d2144843a9f550ad01
970-
let mut key = "026c468be64d22761c30cd2f12cbc7de255d592d7904b1bab07236897cc4c2e766"
969+
let mut key = "02af4ad6e0f1b81b6636e07139fc4948532e0dc1bca915fc0d0c3a231029ca3292"
971970
.parse::<PublicKey>()
972971
.unwrap();
973972
let addr = Address::p2shwpkh(&key, Bitcoin).unwrap();
974-
assert_eq!(&addr.to_string(), "3QBRmWNqqBGme9er7fMkGqtZtp4gjMFxhE");
973+
assert_eq!(&addr.to_string(), "bWJbbsS2rSdf6LqWMxpr2AUamXzgfpB6S4");
975974
assert_eq!(addr.address_type(), Some(AddressType::P2sh));
976975
roundtrips(&addr);
977976

@@ -1011,7 +1010,7 @@ mod tests {
10111010
address: Address<V>,
10121011
}
10131012

1014-
let addr_str = "33iFwdLuRpW1uK1RTRqsoi8rR4NpDzk66k";
1013+
let addr_str = "bSzmVGyeqRJPDanTWovPvNSqD2HrWkMY8C";
10151014
let unchecked = Address::from_str(addr_str).unwrap();
10161015

10171016
assert_eq!(
@@ -1060,41 +1059,41 @@ mod tests {
10601059
use serde_json;
10611060

10621061
let addr =
1063-
Address::from_str("132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM").unwrap().assume_checked();
1062+
Address::from_str("BK1iscer7M7aiTBPo9iLFuits6pqYyEKQ8").unwrap().assume_checked();
10641063
let json = serde_json::to_value(&addr).unwrap();
10651064
assert_eq!(
10661065
json,
1067-
serde_json::Value::String("132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM".to_owned())
1066+
serde_json::Value::String("BK1iscer7M7aiTBPo9iLFuits6pqYyEKQ8".to_owned())
10681067
);
10691068
let into: Address = serde_json::from_value::<Address<_>>(json).unwrap().assume_checked();
10701069
assert_eq!(addr.to_string(), into.to_string());
10711070
assert_eq!(
10721071
into.script_pubkey(),
1073-
ScriptBuf::from_hex("76a914162c5ea71c0b23f5b9022ef047c4a86470a5b07088ac").unwrap()
1072+
ScriptBuf::from_hex("76a9149fbe2c1802902016679f34446dc7a4b09872173e88ac").unwrap()
10741073
);
10751074

10761075
let addr =
1077-
Address::from_str("33iFwdLuRpW1uK1RTRqsoi8rR4NpDzk66k").unwrap().assume_checked();
1076+
Address::from_str("bCoDCTKxY9vNAatcgs8UfbsQbTrdy85szS").unwrap().assume_checked();
10781077
let json = serde_json::to_value(&addr).unwrap();
10791078
assert_eq!(
10801079
json,
1081-
serde_json::Value::String("33iFwdLuRpW1uK1RTRqsoi8rR4NpDzk66k".to_owned())
1080+
serde_json::Value::String("bCoDCTKxY9vNAatcgs8UfbsQbTrdy85szS".to_owned())
10821081
);
10831082
let into: Address = serde_json::from_value::<Address<_>>(json).unwrap().assume_checked();
10841083
assert_eq!(addr.to_string(), into.to_string());
10851084
assert_eq!(
10861085
into.script_pubkey(),
1087-
ScriptBuf::from_hex("a914162c5ea71c0b23f5b9022ef047c4a86470a5b07087").unwrap()
1086+
ScriptBuf::from_hex("a91400bebed3b50b139d9f7632ace2a774f373675bea87").unwrap()
10881087
);
10891088

10901089
let addr: Address<NetworkUnchecked> =
1091-
Address::from_str("tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sl5k7")
1090+
Address::from_str("blk1q2ny6tzxcj3pmph5uf0ph4rgz5396lku8eqxtsxj4g797pwjlpqcqg2h7sn")
10921091
.unwrap();
10931092
let json = serde_json::to_value(addr).unwrap();
10941093
assert_eq!(
10951094
json,
10961095
serde_json::Value::String(
1097-
"tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sl5k7".to_owned()
1096+
"blk1q2ny6tzxcj3pmph5uf0ph4rgz5396lku8eqxtsxj4g797pwjlpqcqg2h7sn".to_owned()
10981097
)
10991098
);
11001099

@@ -1138,11 +1137,11 @@ mod tests {
11381137
#[test]
11391138
fn test_qr_string() {
11401139
for el in
1141-
["132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM", "33iFwdLuRpW1uK1RTRqsoi8rR4NpDzk66k"].iter()
1140+
["B6721rwWhbAK35A64Nra9mrpakimnsr8Jg", "bEJd6m9KbsMvvscqEhuKFJDvNqUJCEMz2J"].iter()
11421141
{
11431142
let addr =
11441143
Address::from_str(el).unwrap().require_network(Network::Bitcoin).expect("mainnet");
1145-
assert_eq!(addr.to_qr_uri(), format!("bitcoin:{}", el));
1144+
assert_eq!(addr.to_qr_uri(), format!("blackcoin:{}", el));
11461145
}
11471146

11481147
for el in [
@@ -1152,7 +1151,7 @@ mod tests {
11521151
.iter()
11531152
{
11541153
let addr = Address::from_str(el).unwrap().assume_checked();
1155-
assert_eq!(addr.to_qr_uri(), format!("bitcoin:{}", el.to_ascii_uppercase()));
1154+
assert_eq!(addr.to_qr_uri(), format!("blackcoin:{}", el.to_ascii_uppercase()));
11561155
}
11571156
}
11581157

@@ -1226,62 +1225,62 @@ mod tests {
12261225

12271226
#[test]
12281227
fn test_is_related_to_pubkey_p2wpkh() {
1229-
let address_string = "bc1qhvd6suvqzjcu9pxjhrwhtrlj85ny3n2mqql5w4";
1228+
let address_string = "blk1qjpe9zucdpxffkeyrnue45tap2jwx7khhefnjag";
12301229
let address = Address::from_str(address_string)
12311230
.expect("address")
12321231
.require_network(Network::Bitcoin)
12331232
.expect("mainnet");
12341233

1235-
let pubkey_string = "0347ff3dacd07a1f43805ec6808e801505a6e18245178609972a68afbc2777ff2b";
1234+
let pubkey_string = "0397aca21423436fbf3dae2121fd1d3ae3b46dff47df38e4fe339a38a9273ff8c5";
12361235
let pubkey = PublicKey::from_str(pubkey_string).expect("pubkey");
12371236

12381237
let result = address.is_related_to_pubkey(&pubkey);
12391238
assert!(result);
12401239

12411240
let unused_pubkey = PublicKey::from_str(
1242-
"02ba604e6ad9d3864eda8dc41c62668514ef7d5417d3b6db46e45cc4533bff001c",
1241+
"02e81c12b9db45dac0d775515679683c56210080fc66aca3676121fc376abd5b4d",
12431242
)
12441243
.expect("pubkey");
12451244
assert!(!address.is_related_to_pubkey(&unused_pubkey))
12461245
}
12471246

12481247
#[test]
12491248
fn test_is_related_to_pubkey_p2shwpkh() {
1250-
let address_string = "3EZQk4F8GURH5sqVMLTFisD17yNeKa7Dfs";
1249+
let address_string = "bJdU95jNeufixTM8edTxgeBAda2aetC22x";
12511250
let address = Address::from_str(address_string)
12521251
.expect("address")
12531252
.require_network(Network::Bitcoin)
12541253
.expect("mainnet");
12551254

1256-
let pubkey_string = "0347ff3dacd07a1f43805ec6808e801505a6e18245178609972a68afbc2777ff2b";
1255+
let pubkey_string = "03f07fde9478fd494384407aa6583977b3fc8a2ed890980d2b11299947ca5049f4";
12571256
let pubkey = PublicKey::from_str(pubkey_string).expect("pubkey");
12581257

12591258
let result = address.is_related_to_pubkey(&pubkey);
12601259
assert!(result);
12611260

12621261
let unused_pubkey = PublicKey::from_str(
1263-
"02ba604e6ad9d3864eda8dc41c62668514ef7d5417d3b6db46e45cc4533bff001c",
1262+
"02160813f7bfdf2a3bc9bdf0cbbe17d678f02acbb2c57d37ebd67781f437de6427",
12641263
)
12651264
.expect("pubkey");
12661265
assert!(!address.is_related_to_pubkey(&unused_pubkey))
12671266
}
12681267

12691268
#[test]
12701269
fn test_is_related_to_pubkey_p2pkh() {
1271-
let address_string = "1J4LVanjHMu3JkXbVrahNuQCTGCRRgfWWx";
1270+
let address_string = "B4VsKWxKdXYsRiwavyNXGgWmqs2n8F7jSM";
12721271
let address = Address::from_str(address_string)
12731272
.expect("address")
12741273
.require_network(Network::Bitcoin)
12751274
.expect("mainnet");
12761275

1277-
let pubkey_string = "0347ff3dacd07a1f43805ec6808e801505a6e18245178609972a68afbc2777ff2b";
1276+
let pubkey_string = "034730e15d59bf36c80ebc540c05fa6b281078ce45079d9f5a2e187ca4f201e65a";
12781277
let pubkey = PublicKey::from_str(pubkey_string).expect("pubkey");
12791278

12801279
let result = address.is_related_to_pubkey(&pubkey);
12811280
assert!(result);
12821281

12831282
let unused_pubkey = PublicKey::from_str(
1284-
"02ba604e6ad9d3864eda8dc41c62668514ef7d5417d3b6db46e45cc4533bff001c",
1283+
"0253f61cf0191f2186613c268129bba94f394c8bd8e4b574441a6c073536669035",
12851284
)
12861285
.expect("pubkey");
12871286
assert!(!address.is_related_to_pubkey(&unused_pubkey))

bitcoin/src/crypto/key.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -786,27 +786,27 @@ mod tests {
786786

787787
// mainnet uncompressed
788788
let sk =
789-
PrivateKey::from_wif("5JYkZjmN7PVMjJUfJWfRFwtuXTGB439XV6faajeHPAM9Z2PT2R3").unwrap();
789+
PrivateKey::from_wif("5JfVx8ogELSKLnbfiiwjpX5twSQZmb4TXwdhYdiaAXScEoLtPHC").unwrap();
790790
assert_eq!(sk.network, Bitcoin);
791791
assert!(!sk.compressed);
792-
assert_eq!(&sk.to_wif(), "5JYkZjmN7PVMjJUfJWfRFwtuXTGB439XV6faajeHPAM9Z2PT2R3");
792+
assert_eq!(&sk.to_wif(), "5JfVx8ogELSKLnbfiiwjpX5twSQZmb4TXwdhYdiaAXScEoLtPHC");
793793

794794
let secp = Secp256k1::new();
795795
let mut pk = sk.public_key(&secp);
796796
assert!(!pk.compressed);
797-
assert_eq!(&pk.to_string(), "042e58afe51f9ed8ad3cc7897f634d881fdbe49a81564629ded8156bebd2ffd1af191923a2964c177f5b5923ae500fca49e99492d534aa3759d6b25a8bc971b133");
798-
assert_eq!(pk, PublicKey::from_str("042e58afe51f9ed8ad3cc7897f634d881fdbe49a81564629ded8156bebd2ffd1af191923a2964c177f5b5923ae500fca49e99492d534aa3759d6b25a8bc971b133").unwrap());
797+
assert_eq!(&pk.to_string(), "04583c64ca2b3b3df27d6948ccac710910c05eb72ff072fd4b3c47682b6f4ed725a08b52ea223f17d5d4e3d9f3db7d2d8744bf6e665a86db14b983260c8e3cae4b");
798+
assert_eq!(pk, PublicKey::from_str("04583c64ca2b3b3df27d6948ccac710910c05eb72ff072fd4b3c47682b6f4ed725a08b52ea223f17d5d4e3d9f3db7d2d8744bf6e665a86db14b983260c8e3cae4b").unwrap());
799799
let addr = Address::p2pkh(&pk, sk.network);
800-
assert_eq!(&addr.to_string(), "1GhQvF6dL8xa6wBxLnWmHcQsurx9RxiMc8");
800+
assert_eq!(&addr.to_string(), "BLEaWznUpyCtsLAGPAKmSsxy94etci25a2");
801801
pk.compressed = true;
802802
assert_eq!(
803803
&pk.to_string(),
804-
"032e58afe51f9ed8ad3cc7897f634d881fdbe49a81564629ded8156bebd2ffd1af"
804+
"03583c64ca2b3b3df27d6948ccac710910c05eb72ff072fd4b3c47682b6f4ed725"
805805
);
806806
assert_eq!(
807807
pk,
808808
PublicKey::from_str(
809-
"032e58afe51f9ed8ad3cc7897f634d881fdbe49a81564629ded8156bebd2ffd1af"
809+
"03583c64ca2b3b3df27d6948ccac710910c05eb72ff072fd4b3c47682b6f4ed725"
810810
)
811811
.unwrap()
812812
);

0 commit comments

Comments
 (0)