blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update test to deserialize txs

This commit is contained in:
Tyera Eulberg 2019-03-29 00:24:09 -06:00 committed by Tyera Eulberg
parent 4776dc36ab
commit 75dcd97f5f
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/blockstream_service.rs
View File

@ -109,6 +109,7 @@ mod test {
use super::*; use super::*;
use crate::blocktree::create_new_tmp_ledger; use crate::blocktree::create_new_tmp_ledger;
use crate::entry::{create_ticks, Entry}; use crate::entry::{create_ticks, Entry};
use bincode::deserialize;
use chrono::{DateTime, FixedOffset}; use chrono::{DateTime, FixedOffset};
use serde_json::Value; use serde_json::Value;
use solana_sdk::genesis_block::GenesisBlock; use solana_sdk::genesis_block::GenesisBlock;
@ -182,13 +183,28 @@ mod test {
assert_eq!(height, expected_tick_heights[i]); assert_eq!(height, expected_tick_heights[i]);
let entry_obj = json["entry"].clone(); let entry_obj = json["entry"].clone();
let tx = entry_obj["transactions"].as_array().unwrap(); let tx = entry_obj["transactions"].as_array().unwrap();
let entry: Entry;
if tx.len() == 0 { if tx.len() == 0 {
// TODO: There is a bug in Transaction deserialize methods such that entry = serde_json::from_value(entry_obj).unwrap();
// `serde_json::from_str` does not work for populated Entries. } else {
// Remove this `if` when fixed. let entry_json = entry_obj.as_object().unwrap();
let entry: Entry = serde_json::from_value(entry_obj).unwrap(); entry = Entry {
assert_eq!(entry, expected_entries[i]); num_hashes: entry_json.get("num_hashes").unwrap().as_u64().unwrap(),
hash: serde_json::from_value(entry_json.get("hash").unwrap().clone()).unwrap(),
transactions: entry_json
.get("transactions")
.unwrap()
.as_array()
.unwrap()
.into_iter()
.map(|tx| {
let tx_vec: Vec<u8> = serde_json::from_value(tx.clone()).unwrap();
deserialize(&tx_vec).unwrap()
})
.collect(),
};
} }
assert_eq!(entry, expected_entries[i]);
} }
for json in block_events { for json in block_events {
let slot = json["s"].as_u64().unwrap(); let slot = json["s"].as_u64().unwrap();