Skip to content

Commit 018ec00

Browse files
AlrightttAlrighttt
authored
Merge pull request #9 from KomodoPlatform/refactor/remove-serde-prefixes
Refactor/remove serde prefixes
2 parents 4cee4a1 + 13065a4 commit 018ec00

18 files changed

+865
-956
lines changed

‎Cargo.lock

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ nom = "6.1.2"
1717
blake2b_simd = "0.5"
1818
chrono = { version = "0.4.23", "features" = ["serde"] }
1919
log = { version = "0.4.19", "features" = ["std"] }
20-
hex = "0.4.2"
20+
hex = { version = "0.4.2", "features" = ["serde"] }
2121
reqwest = { version = "0.11.9", features = ["json", "rustls-tls"], default-features = false }
2222
base64 = "0.21.2"
2323
url = { version = "2.2.2", features = ["serde"] }

‎src/blake2b_internal.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ mod test {
185185
let sigs_required_leaf = sigs_required_leaf(1u64);
186186
accumulator.add_leaf(sigs_required_leaf);
187187

188-
let expected = Hash256::from_str("h:72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515d").unwrap();
188+
let expected = Hash256::from_str("72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515d").unwrap();
189189
assert_eq!(accumulator.root(), expected);
190190
}
191191

@@ -206,7 +206,7 @@ mod test {
206206
accumulator.add_leaf(sigs_required_leaf);
207207

208208
let root = accumulator.root();
209-
let expected = Hash256::from_str("h:72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515d").unwrap();
209+
let expected = Hash256::from_str("72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515d").unwrap();
210210
assert_eq!(root, expected)
211211
}
212212

@@ -234,7 +234,7 @@ mod test {
234234
accumulator.add_leaf(sigs_required_leaf);
235235

236236
let root = accumulator.root();
237-
let expected = Hash256::from_str("h:1e94357817d236167e54970a8c08bbd41b37bfceeeb52f6c1ce6dd01d50ea1e7").unwrap();
237+
let expected = Hash256::from_str("1e94357817d236167e54970a8c08bbd41b37bfceeeb52f6c1ce6dd01d50ea1e7").unwrap();
238238
assert_eq!(root, expected)
239239
}
240240

@@ -262,7 +262,7 @@ mod test {
262262
accumulator.add_leaf(sigs_required_leaf);
263263

264264
let root = accumulator.root();
265-
let expected = Hash256::from_str("h:d7f84e3423da09d111a17f64290c8d05e1cbe4cab2b6bed49e3a4d2f659f0585").unwrap();
265+
let expected = Hash256::from_str("d7f84e3423da09d111a17f64290c8d05e1cbe4cab2b6bed49e3a4d2f659f0585").unwrap();
266266
assert_eq!(root, expected)
267267
}
268268

@@ -273,7 +273,7 @@ mod test {
273273
.unwrap();
274274

275275
let hash = standard_unlock_hash(&pubkey);
276-
let expected = Hash256::from_str("h:72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515d").unwrap();
276+
let expected = Hash256::from_str("72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515d").unwrap();
277277
assert_eq!(hash, expected)
278278
}
279279

@@ -288,7 +288,7 @@ mod test {
288288
.unwrap();
289289

290290
let hash = hash_blake2b_pair(&NODE_HASH_PREFIX, &left, &right);
291-
let expected = Hash256::from_str("h:72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515d").unwrap();
291+
let expected = Hash256::from_str("72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515d").unwrap();
292292
assert_eq!(hash, expected)
293293
}
294294

@@ -306,7 +306,7 @@ mod test {
306306

307307
fn test_hash_blake2b_single() {
308308
let hash = hash_blake2b_single(&hex::decode("006564323535313900000000000000000020000000000000000102030000000000000000000000000000000000000000000000000000000000").unwrap());
309-
let expected = Hash256::from_str("h:21ce940603a2ee3a283685f6bfb4b122254894fd1ed3eb59434aadbf00c75d5b").unwrap();
309+
let expected = Hash256::from_str("21ce940603a2ee3a283685f6bfb4b122254894fd1ed3eb59434aadbf00c75d5b").unwrap();
310310
assert_eq!(hash, expected)
311311
}
312312

@@ -317,7 +317,7 @@ mod test {
317317
.unwrap();
318318

319319
let hash = public_key_leaf(&UnlockKey::Ed25519(pubkey));
320-
let expected = Hash256::from_str("h:21ce940603a2ee3a283685f6bfb4b122254894fd1ed3eb59434aadbf00c75d5b").unwrap();
320+
let expected = Hash256::from_str("21ce940603a2ee3a283685f6bfb4b122254894fd1ed3eb59434aadbf00c75d5b").unwrap();
321321
assert_eq!(hash, expected)
322322
}
323323
}

‎src/encoding.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ mod test {
6666
fn test_encoder_default_hash() {
6767
assert_eq!(
6868
Encoder::default().hash(),
69-
Hash256::from_str("h:0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8").unwrap()
69+
Hash256::from_str("0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8").unwrap()
7070
)
7171
}
7272

@@ -75,7 +75,7 @@ mod test {
7575
encoder.write_len_prefixed_bytes(&[1, 2, 3, 4]);
7676
assert_eq!(
7777
encoder.hash(),
78-
Hash256::from_str("h:d4a72b52e2e1f40e20ee40ea6d5080a1b1f76164786defbb7691a4427f3388f5").unwrap()
78+
Hash256::from_str("d4a72b52e2e1f40e20ee40ea6d5080a1b1f76164786defbb7691a4427f3388f5").unwrap()
7979
);
8080
}
8181

@@ -84,7 +84,7 @@ mod test {
8484
encoder.write_u8(1);
8585
assert_eq!(
8686
encoder.hash(),
87-
Hash256::from_str("h:ee155ace9c40292074cb6aff8c9ccdd273c81648ff1149ef36bcea6ebb8a3e25").unwrap()
87+
Hash256::from_str("ee155ace9c40292074cb6aff8c9ccdd273c81648ff1149ef36bcea6ebb8a3e25").unwrap()
8888
);
8989
}
9090

@@ -93,7 +93,7 @@ mod test {
9393
encoder.write_u64(1);
9494
assert_eq!(
9595
encoder.hash(),
96-
Hash256::from_str("h:1dbd7d0b561a41d23c2a469ad42fbd70d5438bae826f6fd607413190c37c363b").unwrap()
96+
Hash256::from_str("1dbd7d0b561a41d23c2a469ad42fbd70d5438bae826f6fd607413190c37c363b").unwrap()
9797
);
9898
}
9999

@@ -102,7 +102,7 @@ mod test {
102102
encoder.write_distinguisher("test");
103103
assert_eq!(
104104
encoder.hash(),
105-
Hash256::from_str("h:25fb524721bf98a9a1233a53c40e7e198971b003bf23c24f59d547a1bb837f9c").unwrap()
105+
Hash256::from_str("25fb524721bf98a9a1233a53c40e7e198971b003bf23c24f59d547a1bb837f9c").unwrap()
106106
);
107107
}
108108

@@ -111,7 +111,7 @@ mod test {
111111
encoder.write_bool(true);
112112
assert_eq!(
113113
encoder.hash(),
114-
Hash256::from_str("h:ee155ace9c40292074cb6aff8c9ccdd273c81648ff1149ef36bcea6ebb8a3e25").unwrap()
114+
Hash256::from_str("ee155ace9c40292074cb6aff8c9ccdd273c81648ff1149ef36bcea6ebb8a3e25").unwrap()
115115
);
116116
}
117117

@@ -120,14 +120,14 @@ mod test {
120120
encoder.write_bool(true);
121121
assert_eq!(
122122
encoder.hash(),
123-
Hash256::from_str("h:ee155ace9c40292074cb6aff8c9ccdd273c81648ff1149ef36bcea6ebb8a3e25").unwrap()
123+
Hash256::from_str("ee155ace9c40292074cb6aff8c9ccdd273c81648ff1149ef36bcea6ebb8a3e25").unwrap()
124124
);
125125

126126
encoder.reset();
127127
encoder.write_bool(false);
128128
assert_eq!(
129129
encoder.hash(),
130-
Hash256::from_str("h:03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").unwrap()
130+
Hash256::from_str("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").unwrap()
131131
);
132132
}
133133

@@ -139,7 +139,7 @@ mod test {
139139
encoder.write_len_prefixed_bytes(&[1, 2, 3, 4]);
140140
assert_eq!(
141141
encoder.hash(),
142-
Hash256::from_str("h:b66d7a9bef9fb303fe0e41f6b5c5af410303e428c4ff9231f6eb381248693221").unwrap()
142+
Hash256::from_str("b66d7a9bef9fb303fe0e41f6b5c5af410303e428c4ff9231f6eb381248693221").unwrap()
143143
);
144144
}
145145
}

‎src/tests/encoding.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mod test {
1818
let unlock_condition = UnlockCondition::new(vec![pubkey, pubkey2], 0, 2);
1919

2020
let hash = unlock_condition.unlock_hash();
21-
let expected = Hash256::from_str("h:1e94357817d236167e54970a8c08bbd41b37bfceeeb52f6c1ce6dd01d50ea1e7").unwrap();
21+
let expected = Hash256::from_str("1e94357817d236167e54970a8c08bbd41b37bfceeeb52f6c1ce6dd01d50ea1e7").unwrap();
2222
assert_eq!(hash, expected);
2323
}
2424

@@ -34,32 +34,32 @@ mod test {
3434
let unlock_condition = UnlockCondition::new(vec![pubkey, pubkey2], 0, 1);
3535

3636
let hash = unlock_condition.unlock_hash();
37-
let expected = Hash256::from_str("h:d7f84e3423da09d111a17f64290c8d05e1cbe4cab2b6bed49e3a4d2f659f0585").unwrap();
37+
let expected = Hash256::from_str("d7f84e3423da09d111a17f64290c8d05e1cbe4cab2b6bed49e3a4d2f659f0585").unwrap();
3838
assert_eq!(hash, expected);
3939
}
4040

4141
fn test_spend_policy_encode_above() {
4242
let policy = SpendPolicy::above(1);
4343

4444
let hash = Encoder::encode_and_hash(&policy);
45-
let expected = Hash256::from_str("h:bebf6cbdfb440a92e3e5d832ac30fe5d226ff6b352ed3a9398b7d35f086a8ab6").unwrap();
45+
let expected = Hash256::from_str("bebf6cbdfb440a92e3e5d832ac30fe5d226ff6b352ed3a9398b7d35f086a8ab6").unwrap();
4646
assert_eq!(hash, expected);
4747

4848
let address = policy.address();
4949
let expected =
50-
Address::from_str("addr:188b997bb99dee13e95f92c3ea150bd76b3ec72e5ba57b0d57439a1a6e2865e9b25ea5d1825e").unwrap();
50+
Address::from_str("188b997bb99dee13e95f92c3ea150bd76b3ec72e5ba57b0d57439a1a6e2865e9b25ea5d1825e").unwrap();
5151
assert_eq!(address, expected);
5252
}
5353

5454
fn test_spend_policy_encode_after() {
5555
let policy = SpendPolicy::after(1);
5656
let hash = Encoder::encode_and_hash(&policy);
57-
let expected = Hash256::from_str("h:07b0f28eafd87a082ad11dc4724e1c491821260821a30bec68254444f97d9311").unwrap();
57+
let expected = Hash256::from_str("07b0f28eafd87a082ad11dc4724e1c491821260821a30bec68254444f97d9311").unwrap();
5858
assert_eq!(hash, expected);
5959

6060
let address = policy.address();
6161
let expected =
62-
Address::from_str("addr:60c74e0ce5cede0f13f83b0132cb195c995bc7688c9fac34bbf2b14e14394b8bbe2991bc017f").unwrap();
62+
Address::from_str("60c74e0ce5cede0f13f83b0132cb195c995bc7688c9fac34bbf2b14e14394b8bbe2991bc017f").unwrap();
6363
assert_eq!(address, expected);
6464
}
6565

@@ -71,26 +71,26 @@ mod test {
7171
let policy = SpendPolicy::PublicKey(pubkey);
7272

7373
let hash = Encoder::encode_and_hash(&policy);
74-
let expected = Hash256::from_str("h:4355c8f80f6e5a98b70c9c2f9a22f17747989b4744783c90439b2b034f698bfe").unwrap();
74+
let expected = Hash256::from_str("4355c8f80f6e5a98b70c9c2f9a22f17747989b4744783c90439b2b034f698bfe").unwrap();
7575
assert_eq!(hash, expected);
7676

7777
let address = policy.address();
7878
let expected =
79-
Address::from_str("addr:55a7793237722c6df8222fd512063cb74228085ef1805c5184713648c159b919ac792fbad0e1").unwrap();
79+
Address::from_str("55a7793237722c6df8222fd512063cb74228085ef1805c5184713648c159b919ac792fbad0e1").unwrap();
8080
assert_eq!(address, expected);
8181
}
8282

8383
fn test_spend_policy_encode_hash() {
84-
let hash = Hash256::from_str("h:0102030000000000000000000000000000000000000000000000000000000000").unwrap();
84+
let hash = Hash256::from_str("0102030000000000000000000000000000000000000000000000000000000000").unwrap();
8585
let policy = SpendPolicy::Hash(hash);
8686

8787
let hash = Encoder::encode_and_hash(&policy);
88-
let expected = Hash256::from_str("h:9938967aefa6cbecc1f1620d2df5170d6811d4b2f47a879b621c1099a3b0628a").unwrap();
88+
let expected = Hash256::from_str("9938967aefa6cbecc1f1620d2df5170d6811d4b2f47a879b621c1099a3b0628a").unwrap();
8989
assert_eq!(hash, expected);
9090

9191
let address = policy.address();
9292
let expected =
93-
Address::from_str("addr:a4d5a06d8d3c2e45aa26627858ce8e881505ae3c9d122a1d282c7824163751936cffb347e435").unwrap();
93+
Address::from_str("a4d5a06d8d3c2e45aa26627858ce8e881505ae3c9d122a1d282c7824163751936cffb347e435").unwrap();
9494
assert_eq!(address, expected);
9595
}
9696

@@ -101,12 +101,12 @@ mod test {
101101
};
102102

103103
let hash = Encoder::encode_and_hash(&policy);
104-
let expected = Hash256::from_str("h:7d792df6cd0b5e0f795287b3bf4087bbcc4c1bd0c52880a552cdda3e5e33d802").unwrap();
104+
let expected = Hash256::from_str("7d792df6cd0b5e0f795287b3bf4087bbcc4c1bd0c52880a552cdda3e5e33d802").unwrap();
105105
assert_eq!(hash, expected);
106106

107107
let address = policy.address();
108108
let expected =
109-
Address::from_str("addr:4179b53aba165e46e4c85b3c8766bb758fb6f0bfa5721550b81981a3ec38efc460557dc1ded4").unwrap();
109+
Address::from_str("4179b53aba165e46e4c85b3c8766bb758fb6f0bfa5721550b81981a3ec38efc460557dc1ded4").unwrap();
110110
assert_eq!(address, expected);
111111
}
112112

@@ -120,7 +120,7 @@ mod test {
120120
let sub_policy = SpendPolicy::UnlockConditions(unlock_condition);
121121
let base_address = sub_policy.address();
122122
let expected =
123-
Address::from_str("addr:72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515dd64b9a56043a").unwrap();
123+
Address::from_str("72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515dd64b9a56043a").unwrap();
124124
assert_eq!(base_address, expected);
125125

126126
let policy = SpendPolicy::Threshold {
@@ -129,7 +129,7 @@ mod test {
129129
};
130130
let address = policy.address();
131131
let expected =
132-
Address::from_str("addr:1498a58c843ce66740e52421632d67a0f6991ea96db1fc97c29e46f89ae56e3534078876331d").unwrap();
132+
Address::from_str("1498a58c843ce66740e52421632d67a0f6991ea96db1fc97c29e46f89ae56e3534078876331d").unwrap();
133133
assert_eq!(address, expected);
134134
}
135135

@@ -141,7 +141,7 @@ mod test {
141141
let unlock_condition = UnlockCondition::new(vec![pubkey], 0, 1);
142142

143143
let hash = Encoder::encode_and_hash(&unlock_condition);
144-
let expected = Hash256::from_str("h:5d49bae37b97c86573a1525246270c180464acf33d63cc2ac0269ef9a8cb9d98").unwrap();
144+
let expected = Hash256::from_str("5d49bae37b97c86573a1525246270c180464acf33d63cc2ac0269ef9a8cb9d98").unwrap();
145145
assert_eq!(hash, expected);
146146
}
147147

@@ -152,7 +152,7 @@ mod test {
152152
.unwrap();
153153

154154
let hash = Encoder::encode_and_hash(&public_key);
155-
let expected = Hash256::from_str("h:d487326614f066416308bf6aa4e5041d1949928e4b26ede98e3cebb36a3b1726").unwrap();
155+
let expected = Hash256::from_str("d487326614f066416308bf6aa4e5041d1949928e4b26ede98e3cebb36a3b1726").unwrap();
156156
assert_eq!(hash, expected);
157157
}
158158

@@ -164,7 +164,7 @@ mod test {
164164
let unlock_condition = UnlockCondition::new(vec![pubkey.clone()], 0, 1);
165165

166166
let hash = unlock_condition.unlock_hash();
167-
let expected = Hash256::from_str("h:72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515d").unwrap();
167+
let expected = Hash256::from_str("72b0762b382d4c251af5ae25b6777d908726d75962e5224f98d7f619bb39515d").unwrap();
168168
assert_eq!(hash, expected);
169169
let hash = standard_unlock_hash(&pubkey);
170170
assert_eq!(hash, expected);

0 commit comments

Comments
 (0)