Skip to content

Commit 531352e

Browse files
committed
All tests pass except one with cosmrs signing
1 parent 8e332ea commit 531352e

6 files changed

Lines changed: 24 additions & 17 deletions

File tree

packages/app/src/app.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,10 @@ mod tests {
511511
// query account + balances for update
512512
fn transaction_workflow<T: PersistentStorage + 'static>(storage: T) {
513513
// TODO: convert bech32 to 0x checksummed (make script)
514-
let sender = must_id("slay3r1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmvk3r3j");
515-
let recipient = must_id("slay3r1y5hl7x8hxl72dc9gu920eaz6l7vhl0luu6s70h");
514+
let sender = must_id("0x0d82b1E7c96dbfA42462fE612932e6bfF111D51B");
515+
let recipient = must_id("0x252fFf18f737fcA6E0A8E154FCf45aFf997fBFFc");
516+
// let sender = must_id("slay3r1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmvk3r3j");
517+
// let recipient = must_id("slay3r1y5hl7x8hxl72dc9gu920eaz6l7vhl0luu6s70h");
516518
let denom: &str = "uslay";
517519

518520
let expected_gas = 16_000u64;
@@ -572,7 +574,7 @@ mod tests {
572574
recipient: recipient.clone(),
573575
amount: coins(2_000_000, denom),
574576
})],
575-
signer: must_id("slay3r1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmvk3r3j"),
577+
signer: must_id("0x0d82b1E7c96dbfA42462fE612932e6bfF111D51B"),
576578
signing_info: SigningInfo {
577579
message_hash: Binary::from(
578580
hex!("6d368a4b8436e0b19a2d06069e0b70086ba7c40e91a9d04d31946c10346d79a9")

packages/app/src/testing/hackatom.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,9 @@ fn error_handling_from_api_call() {
306306
match err {
307307
PulsarError::Wasm(WasmError::Contract(msg)) => {
308308
assert!(
309-
msg.starts_with("Generic error: addr_validate errored: Bech32:"),
309+
msg.starts_with(
310+
"Generic error: addr_validate errored: Address: invalid string length"
311+
),
310312
"Unexpected error message: {}",
311313
msg
312314
);

packages/cosmos/src/legacy.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -271,18 +271,20 @@ mod tests {
271271
age: 32,
272272
height: Some(187),
273273
};
274+
// cargo run slay3r1ve6ku6mevd5xjcmtv4hqqqqqqqqqqqqqc5nacv slay3r1vfkxzcmtdphkcetndahqqqqqqqqqqqqqyet8zv
275+
//
276+
//
274277
let exec_msg = Msg::Wasm(WasmMsg::Execute {
275-
sender: AccountId::parse_string("slay3r1ve6ku6mevd5xjcmtv4hqqqqqqqqqqqqqc5nacv")
276-
.unwrap(),
277-
contract_addr: AccountId::parse_string("slay3r1vfkxzcmtdphkcetndahqqqqqqqqqqqqqyet8zv")
278+
sender: AccountId::parse_string("0x66756e6b79636869636b656E0000000000000000").unwrap(),
279+
contract_addr: AccountId::parse_string("0x626C61636b686F6c65736f6E0000000000000000")
278280
.unwrap(),
279281
msg: serde_json::to_vec(&orig_msg).unwrap().into(),
280282
funds: vec![],
281283
});
282284

283285
let amino_msg = AminoMsg::build(&exec_msg);
284286
let output = serde_json::to_string(&amino_msg).unwrap();
285-
let expected = r#"{"type":"wasm/MsgExecuteContract","value":{"contract":"slay3r1vfkxzcmtdphkcetndahqqqqqqqqqqqqqyet8zv","funds":[],"msg":{"age":32,"height":187,"name":"John Smith"},"sender":"slay3r1ve6ku6mevd5xjcmtv4hqqqqqqqqqqqqqc5nacv"}}"#;
287+
let expected = r#"{"type":"wasm/MsgExecuteContract","value":{"contract":"0x626C61636b686F6c65736f6E0000000000000000","funds":[],"msg":{"age":32,"height":187,"name":"John Smith"},"sender":"0x66756e6b79636869636b656E0000000000000000"}}"#;
286288
assert_eq!(output, expected);
287289
}
288290

@@ -294,10 +296,9 @@ mod tests {
294296
height: Some(165),
295297
};
296298
let init_msg = Msg::Wasm(WasmMsg::Instantiate {
297-
sender: AccountId::parse_string("slay3r1ve6ku6mevd5xjcmtv4hqqqqqqqqqqqqqc5nacv")
298-
.unwrap(),
299+
sender: AccountId::parse_string("0x66756e6b79636869636b656E0000000000000000").unwrap(),
299300
admin: Some(
300-
AccountId::parse_string("slay3r1vfkxzcmtdphkcetndahqqqqqqqqqqqqqyet8zv").unwrap(),
301+
AccountId::parse_string("0x626C61636b686F6c65736f6E0000000000000000").unwrap(),
301302
),
302303
code_id: 12345,
303304
label: "sticky".into(),
@@ -307,7 +308,7 @@ mod tests {
307308

308309
let amino_msg = AminoMsg::build(&init_msg);
309310
let output = serde_json::to_string(&amino_msg).unwrap();
310-
let expected = r#"{"type":"wasm/MsgInstantiateContract","value":{"admin":"slay3r1vfkxzcmtdphkcetndahqqqqqqqqqqqqqyet8zv","code_id":"12345","funds":[{"amount":"1234","denom":"uslay"}],"label":"sticky","msg":{"age":18,"height":165,"name":"n00b"},"sender":"slay3r1ve6ku6mevd5xjcmtv4hqqqqqqqqqqqqqc5nacv"}}"#;
311+
let expected = r#"{"type":"wasm/MsgInstantiateContract","value":{"admin":"0x626C61636b686F6c65736f6E0000000000000000","code_id":"12345","funds":[{"amount":"1234","denom":"uslay"}],"label":"sticky","msg":{"age":18,"height":165,"name":"n00b"},"sender":"0x66756e6b79636869636b656E0000000000000000"}}"#;
311312
assert_eq!(output, expected);
312313
}
313314

@@ -320,8 +321,7 @@ mod tests {
320321
height: Some(165),
321322
};
322323
let init_msg = Msg::Wasm(WasmMsg::Instantiate {
323-
sender: AccountId::parse_string("slay3r1ve6ku6mevd5xjcmtv4hqqqqqqqqqqqqqc5nacv")
324-
.unwrap(),
324+
sender: AccountId::parse_string("0x66756e6b79636869636b656E0000000000000000").unwrap(),
325325
admin: None,
326326
code_id: 12345,
327327
label: "sticky".into(),
@@ -331,7 +331,7 @@ mod tests {
331331

332332
let amino_msg = AminoMsg::build(&init_msg);
333333
let output = serde_json::to_string(&amino_msg).unwrap();
334-
let expected = r#"{"type":"wasm/MsgInstantiateContract","value":{"code_id":"12345","funds":[],"label":"sticky","msg":{"age":18,"height":165,"name":"n00b"},"sender":"slay3r1ve6ku6mevd5xjcmtv4hqqqqqqqqqqqqqc5nacv"}}"#;
334+
let expected = r#"{"type":"wasm/MsgInstantiateContract","value":{"code_id":"12345","funds":[],"label":"sticky","msg":{"age":18,"height":165,"name":"n00b"},"sender":"0x66756e6b79636869636b656E0000000000000000"}}"#;
335335
assert_eq!(output, expected);
336336
}
337337
}

packages/cosmos/src/query.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ mod tests {
406406
use hex_literal::hex;
407407

408408
#[test]
409+
#[ignore = "need to get new data with 0x address"]
409410
fn parse_simulate() {
410411
let path = "/cosmos.tx.v1beta1.Service/Simulate";
411412
let data = hex!("1282020AAB010A91010A1C2F636F736D6F732E62616E6B2E763162657461312E4D736753656E6412710A2D736C6179337231706B707472653766646B6C366766727A6C65736A6A766878686C63337234676D766B3372336A122D736C6179337231757A3479303579387366736D75657A61616B70706D68326470636667797A72716439723063611A110A067570756C7365120732303030303030121555736520796F757220706F77657220776973656C7912500A4C0A460A1F2F636F736D6F732E63727970746F2E736563703235366B312E5075624B657912230A21034F04181EEBA35391B858633A765C4A0C189697B40D216354D50890D350C7029012020A0012001A00");

packages/cosmos/src/tx.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ mod test {
189189

190190
const DEFAULT_BECH32_PREFIX: &str = "slay3r";
191191

192+
// TODO: this is broken as cosmrs seems to require bech32 - we can otherwise encode the id, but the MsgSend creation below
193+
// requires the bech32 objects from cosmrs. Anyway around this? Or alternatives to cosmrs?
192194
#[test]
193195
fn happy_path_tx_parsing() {
194196
let sender_private_key = secp256k1::SigningKey::random();

packages/golem/src/signer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ mod tests {
9595

9696
assert_eq!(
9797
key.account(),
98-
AccountId::parse_string("slay3r1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmvk3r3j").unwrap()
98+
AccountId::parse_string("0x0d82b1E7c96dbfA42462fE612932e6bfF111D51B").unwrap() // AccountId::parse_string("slay3r1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmvk3r3j").unwrap()
9999
);
100100
assert_eq!(key.index(), 0);
101101

102102
let key2 = key.with_index(1);
103103
assert_eq!(
104104
key2.account(),
105-
AccountId::parse_string("slay3r10dyr9899g6t0pelew4nvf4j5c3jcgv0rf3kguu").unwrap()
105+
AccountId::parse_string("0x7b48329ca54696F0e7F97566C4d654C4658431e3").unwrap() // AccountId::parse_string("slay3r10dyr9899g6t0pelew4nvf4j5c3jcgv0rf3kguu").unwrap()
106106
);
107107
assert_eq!(key2.index(), 1);
108108
}

0 commit comments

Comments
 (0)