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

Fix wallet integration tests

This commit is contained in:
Tyera Eulberg 2019-03-07 18:25:34 -07:00 committed by Greg Fitzgerald
parent c5e9c6fdb6
commit 639cb49356
2 changed files with 16 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
wallet/src/wallet.rs
View File

@ -567,37 +567,11 @@ fn process_pay(
None => config.id.pubkey(), None => config.id.pubkey(),
}; };
let contract_funds = Keypair::new();
let contract_state = Keypair::new(); let contract_state = Keypair::new();
let budget_program_id = solana_budget_api::id();
// Create account for contract funds
let mut tx = SystemTransaction::new_program_account(
&config.id,
contract_funds.pubkey(),
blockhash,
lamports,
0,
budget_program_id,
0,
);
send_and_confirm_transaction(&rpc_client, &mut tx, &config.id)?;
// Create account for contract state
let mut tx = SystemTransaction::new_program_account(
&config.id,
contract_state.pubkey(),
blockhash,
1,
196,
budget_program_id,
0,
);
send_and_confirm_transaction(&rpc_client, &mut tx, &config.id)?;
// Initializing contract // Initializing contract
let mut tx = BudgetTransaction::new_on_date( let mut tx = BudgetTransaction::new_on_date(
&contract_funds, &config.id,
to, to,
contract_state.pubkey(), contract_state.pubkey(),
dt, dt,
@ -624,37 +598,11 @@ fn process_pay(
))? ))?
}; };
let contract_funds = Keypair::new();
let contract_state = Keypair::new(); let contract_state = Keypair::new();
let budget_program_id = solana_budget_api::id();
// Create account for contract funds
let mut tx = SystemTransaction::new_program_account(
&config.id,
contract_funds.pubkey(),
blockhash,
lamports,
0,
budget_program_id,
0,
);
send_and_confirm_transaction(&rpc_client, &mut tx, &config.id)?;
// Create account for contract state
let mut tx = SystemTransaction::new_program_account(
&config.id,
contract_state.pubkey(),
blockhash,
1,
196,
budget_program_id,
0,
);
send_and_confirm_transaction(&rpc_client, &mut tx, &config.id)?;
// Initializing contract // Initializing contract
let mut tx = BudgetTransaction::new_when_signed( let mut tx = BudgetTransaction::new_when_signed(
&contract_funds, &config.id,
to, to,
contract_state.pubkey(), contract_state.pubkey(),
witness, witness,

28
wallet/tests/pay.rs
View File

@ -62,16 +62,16 @@ fn test_wallet_timestamp_tx() {
.expect("base58-encoded public key"); .expect("base58-encoded public key");
let process_id = Pubkey::new(&process_id_vec); let process_id = Pubkey::new(&process_id_vec);
check_balance(39, &rpc_client, config_payer.id.pubkey()); // config_payer balance check_balance(40, &rpc_client, config_payer.id.pubkey()); // config_payer balance
check_balance(11, &rpc_client, process_id); // contract balance check_balance(10, &rpc_client, process_id); // contract balance
check_balance(0, &rpc_client, bob_pubkey); // recipient balance check_balance(0, &rpc_client, bob_pubkey); // recipient balance
// Sign transaction by config_witness // Sign transaction by config_witness
config_witness.command = WalletCommand::TimeElapsed(bob_pubkey, process_id, dt); config_witness.command = WalletCommand::TimeElapsed(bob_pubkey, process_id, dt);
process_command(&config_witness).unwrap(); process_command(&config_witness).unwrap();
check_balance(39, &rpc_client, config_payer.id.pubkey()); // config_payer balance check_balance(40, &rpc_client, config_payer.id.pubkey()); // config_payer balance
check_balance(1, &rpc_client, process_id); // contract balance check_balance(0, &rpc_client, process_id); // contract balance
check_balance(10, &rpc_client, bob_pubkey); // recipient balance check_balance(10, &rpc_client, bob_pubkey); // recipient balance
server.close().unwrap(); server.close().unwrap();
@ -119,16 +119,16 @@ fn test_wallet_witness_tx() {
.expect("base58-encoded public key"); .expect("base58-encoded public key");
let process_id = Pubkey::new(&process_id_vec); let process_id = Pubkey::new(&process_id_vec);
check_balance(39, &rpc_client, config_payer.id.pubkey()); // config_payer balance check_balance(40, &rpc_client, config_payer.id.pubkey()); // config_payer balance
check_balance(11, &rpc_client, process_id); // contract balance check_balance(10, &rpc_client, process_id); // contract balance
check_balance(0, &rpc_client, bob_pubkey); // recipient balance check_balance(0, &rpc_client, bob_pubkey); // recipient balance
// Sign transaction by config_witness // Sign transaction by config_witness
config_witness.command = WalletCommand::Witness(bob_pubkey, process_id); config_witness.command = WalletCommand::Witness(bob_pubkey, process_id);
process_command(&config_witness).unwrap(); process_command(&config_witness).unwrap();
check_balance(39, &rpc_client, config_payer.id.pubkey()); // config_payer balance check_balance(40, &rpc_client, config_payer.id.pubkey()); // config_payer balance
check_balance(1, &rpc_client, process_id); // contract balance check_balance(0, &rpc_client, process_id); // contract balance
check_balance(10, &rpc_client, bob_pubkey); // recipient balance check_balance(10, &rpc_client, bob_pubkey); // recipient balance
server.close().unwrap(); server.close().unwrap();
@ -167,25 +167,25 @@ fn test_wallet_cancel_tx() {
Some(vec![config_witness.id.pubkey()]), Some(vec![config_witness.id.pubkey()]),
Some(config_payer.id.pubkey()), Some(config_payer.id.pubkey()),
); );
let sig_response = process_command(&config_payer); let sig_response = process_command(&config_payer).unwrap();
let object: Value = serde_json::from_str(&sig_response.unwrap()).unwrap(); let object: Value = serde_json::from_str(&sig_response).unwrap();
let process_id_str = object.get("processId").unwrap().as_str().unwrap(); let process_id_str = object.get("processId").unwrap().as_str().unwrap();
let process_id_vec = bs58::decode(process_id_str) let process_id_vec = bs58::decode(process_id_str)
.into_vec() .into_vec()
.expect("base58-encoded public key"); .expect("base58-encoded public key");
let process_id = Pubkey::new(&process_id_vec); let process_id = Pubkey::new(&process_id_vec);
check_balance(39, &rpc_client, config_payer.id.pubkey()); // config_payer balance check_balance(40, &rpc_client, config_payer.id.pubkey()); // config_payer balance
check_balance(11, &rpc_client, process_id); // contract balance check_balance(10, &rpc_client, process_id); // contract balance
check_balance(0, &rpc_client, bob_pubkey); // recipient balance check_balance(0, &rpc_client, bob_pubkey); // recipient balance
// Sign transaction by config_witness // Sign transaction by config_witness
config_payer.command = WalletCommand::Cancel(process_id); config_payer.command = WalletCommand::Cancel(process_id);
process_command(&config_payer).unwrap(); process_command(&config_payer).unwrap();
check_balance(49, &rpc_client, config_payer.id.pubkey()); // config_payer balance check_balance(50, &rpc_client, config_payer.id.pubkey()); // config_payer balance
check_balance(1, &rpc_client, process_id); // contract balance check_balance(0, &rpc_client, process_id); // contract balance
check_balance(0, &rpc_client, bob_pubkey); // recipient balance check_balance(0, &rpc_client, bob_pubkey); // recipient balance
server.close().unwrap(); server.close().unwrap();