gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Serialize transaction in proper wire format instead of json (#6889)

Browse Source
This commit is contained in:
Tyera Eulberg
2019-11-12 10:45:10 -05:00
committed by GitHub
parent 188dbdb068
commit 7e82450d7b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/rpc.rs
View File

@ -278,7 +278,7 @@ impl JsonRpcRequestProcessor {
// tuples (Transaction, transaction::Result) to demonstrate message format and // tuples (Transaction, transaction::Result) to demonstrate message format and
// TransactionErrors. Transaction count == slot, and transaction keys are derived // TransactionErrors. Transaction count == slot, and transaction keys are derived
// deterministically to allow testers to track the pubkeys across slots. // deterministically to allow testers to track the pubkeys across slots.
pub fn get_block(&self, slot: Slot) -> Result<Vec<(Transaction, transaction::Result<()>)>> { pub fn get_block(&self, slot: Slot) -> Result<Vec<(Vec<u8>, transaction::Result<()>)>> {
Ok(make_test_transactions(slot)) Ok(make_test_transactions(slot))
} }
} }
@ -511,7 +511,7 @@ pub trait RpcSol {
&self, &self,
meta: Self::Metadata, meta: Self::Metadata,
slot: Slot, slot: Slot,
) -> Result<Vec<(Transaction, transaction::Result<()>)>>; ) -> Result<Vec<(Vec<u8>, transaction::Result<()>)>>;
} }
pub struct RpcSolImpl; pub struct RpcSolImpl;
@ -974,15 +974,15 @@ impl RpcSol for RpcSolImpl {
&self, &self,
meta: Self::Metadata, meta: Self::Metadata,
slot: Slot, slot: Slot,
) -> Result<Vec<(Transaction, transaction::Result<()>)>> { ) -> Result<Vec<(Vec<u8>, transaction::Result<()>)>> {
meta.request_processor.read().unwrap().get_block(slot) meta.request_processor.read().unwrap().get_block(slot)
} }
} }
fn make_test_transactions(count: u64) -> Vec<(Transaction, transaction::Result<()>)> { fn make_test_transactions(count: u64) -> Vec<(Vec<u8>, transaction::Result<()>)> {
let seed = [42u8; 32]; let seed = [42u8; 32];
let keys = GenKeys::new(seed).gen_n_keypairs(count + 1); let keys = GenKeys::new(seed).gen_n_keypairs(count + 1);
let mut transactions: Vec<(Transaction, transaction::Result<()>)> = Vec::new(); let mut transactions: Vec<(Vec<u8>, transaction::Result<()>)> = Vec::new();
for x in 0..count { for x in 0..count {
let tx = system_transaction::transfer( let tx = system_transaction::transfer(
&keys[x as usize], &keys[x as usize],
@ -990,6 +990,7 @@ fn make_test_transactions(count: u64) -> Vec<(Transaction, transaction::Result<(
123, 123,
Hash::default(), Hash::default(),
); );
let wire_transaction = serialize(&tx).unwrap();
let status = if x % 3 == 0 { let status = if x % 3 == 0 {
Ok(()) Ok(())
} else if x % 3 == 1 { } else if x % 3 == 1 {
@ -1003,7 +1004,7 @@ fn make_test_transactions(count: u64) -> Vec<(Transaction, transaction::Result<(
InstructionError::CustomError(3), InstructionError::CustomError(3),
)) ))
}; };
transactions.push((tx, status)) transactions.push((wire_transaction, status))
} }
transactions transactions
} }