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

Testing for Eth Backing Module #172

Merged
merged 17 commits into from
Dec 20, 2019
Merged

Testing for Eth Backing Module #172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
803ff18
Start unit testing for EthBacking module
hackfisher Dec 17, 2019
59cc98e
Merge branch 'develop' into denny_fixing_eth_backing
hackfisher Dec 17, 2019
bc1eef9
parse_token_redeem_proof test
hackfisher Dec 18, 2019
5273638
add genesis config mock
hackfisher Dec 18, 2019
b3b9d3a
Fix accounnt id decoding issues
hackfisher Dec 18, 2019
add72c1
Fixing for pr reviews
hackfisher Dec 18, 2019
7457f45
add redeem ring test
readlnh Dec 18, 2019
5b49e39
add redeem kton test
readlnh Dec 18, 2019
3faeb12
Fixing wrong paramter index
hackfisher Dec 19, 2019
6fc9781
Merge remote-tracking branch 'upstream/denny_fixing_eth_backing' int…
readlnh Dec 19, 2019
041a90e
changed deposit_redeem_adress
readlnh Dec 19, 2019
40e207d
add verify_redeem_deposit
readlnh Dec 19, 2019
408bd24
Merge pull request #173 from readlnh/eth_backing_test
hackfisher Dec 19, 2019
07694a3
Fixed #174, and adding tests for staking ledger
hackfisher Dec 19, 2019
9af9961
Add events and fix side effect issues related to #177
hackfisher Dec 20, 2019
0c44fa0
renaming RingBalanceOf to Ring
hackfisher Dec 20, 2019
ab4375e
Fix bug and test fail
hackfisher Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions srml/eth-backing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2018"
[dependencies]
# crates.io
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
hex = { version = "0.4", default-features = false }
#hex = { version = "0.4", default-features = false }
serde = { version = "1.0.101", optional = true }

# github.com
Expand Down Expand Up @@ -46,7 +46,7 @@ rlp = { package = "rlp", git = "https://github.com/darwinia-network/parity-commo
default = ["std"]
std = [
"codec/std",
"hex/std",
# "hex/std",
"serde/std",

"ethabi/std",
Expand Down
18 changes: 11 additions & 7 deletions srml/eth-backing/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ decl_module! {
.clone()
.to_bytes()
.ok_or("Convert to Bytes - FAILED")?;
let decoded_sub_key = hex::decode(&raw_sub_key).map_err(|_| "Decode Address - FAILED")?;
// let decoded_sub_key = hex::decode(&raw_sub_key).map_err(|_| "Decode Address - FAILED")?;

T::DetermineAccountId::account_id_for(&decoded_sub_key)?
T::DetermineAccountId::account_id_for(&raw_sub_key[..])?
hackfisher marked this conversation as resolved.
Show resolved Hide resolved
};
let redeemed_ring = <RingBalanceOf<T>>::saturated_from(redeemed_amount);
let redeemed_positive_imbalance_ring = T::Ring::deposit_into_existing(&darwinia_account, redeemed_ring)?;
Expand Down Expand Up @@ -296,10 +296,10 @@ impl<T: Trait> Module<T> {
.to_bytes()
.ok_or("Convert to Bytes - FAILED")?;

// println!("raw_sub_key: {:?}", raw_sub_key);
let decoded_sub_key = hex::decode(&raw_sub_key).map_err(|_| "Decode Address - FAILED")?;
// let decoded_sub_key = hex::decode(&raw_sub_key).map_err(|_| "Decode Address - FAILED")?;

T::DetermineAccountId::account_id_for(&raw_sub_key)?
// println!("raw_sub_key: {:?}", raw_sub_key);
T::DetermineAccountId::account_id_for(&raw_sub_key[..])?
};

Ok((darwinia_account, redeemed_amount))
Expand All @@ -318,12 +318,16 @@ where
T::AccountId: rstd::convert::From<[u8; 32]> + AsRef<[u8]>,
{
fn account_id_for(decoded_sub_key: &[u8]) -> result::Result<T::AccountId, &'static str> {
if decoded_sub_key.len() != 32 {
if decoded_sub_key.len() != 33 {
hackfisher marked this conversation as resolved.
Show resolved Hide resolved
return Err("Address Length - MISMATCHED");
}

if decoded_sub_key[0] != 42 {
hackfisher marked this conversation as resolved.
Show resolved Hide resolved
return Err("Pubkey Prefix - MISMATCHED");
}

let mut r = [0u8; 32];
r.copy_from_slice(&decoded_sub_key[..]);
r.copy_from_slice(&decoded_sub_key[1..]);

let darwinia_account = r.into();

Expand Down
4 changes: 3 additions & 1 deletion srml/eth-backing/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ fn verify_parse_token_redeem_proof() {

assert_ok!(EthRelay::init_genesis_header(&header, 0x68de130d2c02a8_u64));

assert_eq!(EthBacking::parse_token_redeem_proof(&proof_record, "RingBurndropTokens"), Ok((AccountId::default(), 0)));
let expect_account_id = <Test as Trait>::DetermineAccountId::account_id_for(&hex!("2a92ae5b41feba5ee68a61449c557efa9e3b894a6461c058ec2de45429adb44546")).ok().unwrap();

assert_eq!(EthBacking::parse_token_redeem_proof(&proof_record, "RingBurndropTokens"), Ok((expect_account_id, 1234567891)));
});
}