Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update lock cell for segwit and address format #491

Merged
merged 2 commits into from
Apr 18, 2019
Merged

chore: update lock cell for segwit and address format #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b029161
chore: update lock cell for segwit and address format
classicalliu Apr 17, 2019
0100ba6
test: fix test for replace cell
classicalliu Apr 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file renamed resource/specs/cells/secp256k1_blake2b_lock → ...pecs/cells/secp256k1_blake160_sighash_all
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion resource/specs/testnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ cycle_length = 12
# An array list paths to system cell files, which is absolute or relative to
# the directory containing this config file.
[[system_cells]]
path = "cells/secp256k1_blake2b_lock"
path = "cells/secp256k1_blake160_sighash_all"
9 changes: 5 additions & 4 deletions resource/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,9 @@ mod tests {
Some(Resource::Bundled("specs/cells/always_success".into()))
);
assert_eq!(
locator.resolve_relative_to("cells/secp256k1_blake2b_lock".into(), &ckb),
locator.resolve_relative_to("cells/secp256k1_blake160_sighash_all".into(), &ckb),
Some(Resource::Bundled(
"specs/cells/secp256k1_blake2b_lock".into()
"specs/cells/secp256k1_blake160_sighash_all".into()
))
);
assert_eq!(locator.resolve_relative_to("x".into(), &ckb), None);
Expand All @@ -316,9 +316,10 @@ mod tests {
Some(Resource::FileSystem(always_success_path.clone()))
);
assert_eq!(
locator.resolve_relative_to("cells/secp256k1_blake2b_lock".into(), &spec_dev),
locator
.resolve_relative_to("cells/secp256k1_blake160_sighash_all".into(), &spec_dev),
Some(Resource::Bundled(
"specs/cells/secp256k1_blake2b_lock".into()
"specs/cells/secp256k1_blake160_sighash_all".into()
))
);
assert_eq!(locator.resolve_relative_to("x".into(), &spec_dev), None);
Expand Down
2 changes: 1 addition & 1 deletion spec/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ pub mod test {
let data_hash = tx.outputs()[0].data_hash();
assert_eq!(
format!("{:x}", data_hash),
"fe1cf5a297023a3c5282ecd9b0ca88d6736424d75fbe4dcf47a7c8b303e4d339"
"55a809b92c5c404989bfe523639a741f4368ecaa3d4c42d1eb8854445b1b798b"
);
}
}