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

Fix pubsub test

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-07 14:19:43 -07:00
parent 3dc22e7323
commit 125a345c90
1 changed files with 23 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
core/src/rpc_pubsub.rs
View File

@ -348,68 +348,22 @@ mod tests {
let (subscriber, _id_receiver, mut receiver) = Subscriber::new_test("accountNotification"); let (subscriber, _id_receiver, mut receiver) = Subscriber::new_test("accountNotification");
rpc.account_subscribe(session, subscriber, contract_state.pubkey().to_string()); rpc.account_subscribe(session, subscriber, contract_state.pubkey().to_string());
let tx = SystemTransaction::new_program_account( let tx = SystemTransaction::new_account(&alice, contract_funds.pubkey(), 51, blockhash, 0);
&alice,
contract_funds.pubkey(),
blockhash,
50,
0,
budget_program_id,
0,
);
let arc_bank = process_transaction_and_notify(&arc_bank, &tx, &rpc.subscriptions).unwrap(); let arc_bank = process_transaction_and_notify(&arc_bank, &tx, &rpc.subscriptions).unwrap();
let tx = SystemTransaction::new_program_account(
&alice,
contract_state.pubkey(),
blockhash,
1,
196,
budget_program_id,
0,
);
let arc_bank = process_transaction_and_notify(&arc_bank, &tx, &rpc.subscriptions).unwrap();
// Test signature confirmation notification #1
let string = receiver.poll();
let expected_userdata = arc_bank
.get_account(&contract_state.pubkey())
.unwrap()
.userdata;
let expected = json!({
"jsonrpc": "2.0",
"method": "accountNotification",
"params": {
"result": {
"owner": budget_program_id,
"lamports": 1,
"userdata": expected_userdata,
"executable": executable,
},
"subscription": 0,
}
});
if let Async::Ready(Some(response)) = string.unwrap() {
assert_eq!(serde_json::to_string(&expected).unwrap(), response);
}
let tx = BudgetTransaction::new_when_signed( let tx = BudgetTransaction::new_when_signed(
&contract_funds, &contract_funds,
bob_pubkey, bob_pubkey,
contract_state.pubkey(), contract_state.pubkey(),
witness.pubkey(), witness.pubkey(),
None, None,
50, 51,
blockhash, blockhash,
); );
let arc_bank = process_transaction_and_notify(&arc_bank, &tx, &rpc.subscriptions).unwrap(); let arc_bank = process_transaction_and_notify(&arc_bank, &tx, &rpc.subscriptions).unwrap();
sleep(Duration::from_millis(200)); sleep(Duration::from_millis(200));
// Test signature confirmation notification #2 // Test signature confirmation notification #1
let string = receiver.poll(); let string = receiver.poll();
let expected_userdata = arc_bank let expected_userdata = arc_bank
.get_account(&contract_state.pubkey()) .get_account(&contract_state.pubkey())
@ -445,27 +399,26 @@ mod tests {
let arc_bank = process_transaction_and_notify(&arc_bank, &tx, &rpc.subscriptions).unwrap(); let arc_bank = process_transaction_and_notify(&arc_bank, &tx, &rpc.subscriptions).unwrap();
sleep(Duration::from_millis(200)); sleep(Duration::from_millis(200));
let expected_userdata = arc_bank assert_eq!(arc_bank.get_account(&contract_state.pubkey()), None);
.get_account(&contract_state.pubkey())
.unwrap() // TODO: Should we get a notification of an empty account?
.userdata; //let expected = json!({
let expected = json!({ // "jsonrpc": "2.0",
"jsonrpc": "2.0", // "method": "accountNotification",
"method": "accountNotification", // "params": {
"params": { // "result": {
"result": { // "owner": budget_program_id,
"owner": budget_program_id, // "lamports": 1,
"lamports": 1, // "userdata": expected_userdata,
"userdata": expected_userdata, // "executable": executable,
"executable": executable, // },
}, // "subscription": 0,
"subscription": 0, // }
} //});
}); //let string = receiver.poll();
let string = receiver.poll(); //if let Async::Ready(Some(response)) = string.unwrap() {
if let Async::Ready(Some(response)) = string.unwrap() { // assert_eq!(serde_json::to_string(&expected).unwrap(), response);
assert_eq!(serde_json::to_string(&expected).unwrap(), response); //}
}
} }
#[test] #[test]