diff --git a/tests/web/test_basic_views.py b/tests/web/test_basic_views.py index f994e710..839c65d6 100644 --- a/tests/web/test_basic_views.py +++ b/tests/web/test_basic_views.py @@ -31,43 +31,32 @@ def test_api_endpoint_shows_basic_info(client): def test_post_create_transaction_endpoint(b, client): - keypair = crypto.generate_key_pair() + sk, vk = crypto.generate_key_pair() - tx = util.create_and_sign_tx(keypair[0], keypair[1], keypair[1], None, 'CREATE') + tx = util.create_and_sign_tx(sk, vk, vk, None, 'CREATE') res = client.post(TX_ENDPOINT, data=json.dumps(tx)) assert res.json['transaction']['fulfillments'][0]['owners_before'][0] == b.me - assert res.json['transaction']['conditions'][0]['owners_after'][0] == keypair[1] + assert res.json['transaction']['conditions'][0]['owners_after'][0] == vk @pytest.mark.usefixtures('inputs') def test_post_transfer_transaction_endpoint(b, client, user_vk, user_sk): - to_keypair = crypto.generate_key_pair() + sk, vk = crypto.generate_key_pair() input_valid = b.get_owned_ids(user_vk).pop() - transfer = util.create_and_sign_tx(user_sk, user_vk, to_keypair[1], input_valid) + transfer = util.create_and_sign_tx(user_sk, user_vk, vk, input_valid) res = client.post(TX_ENDPOINT, data=json.dumps(transfer)) assert res.json['transaction']['fulfillments'][0]['owners_before'][0] == user_vk - assert res.json['transaction']['conditions'][0]['owners_after'][0] == to_keypair[1] + assert res.json['transaction']['conditions'][0]['owners_after'][0] == vk @pytest.mark.usefixtures('inputs') def test_post_invalid_transfer_transaction_returns_400(b, client, user_vk, user_sk): - to_keypair = crypto.generate_key_pair() + sk, vk = crypto.generate_key_pair() input_valid = b.get_owned_ids(user_vk).pop() - transfer = b.create_transaction(user_vk, to_keypair[0], input_valid, 'TRANSFER') - # transfer is not signed - res = client.post(TX_ENDPOINT, data=json.dumps(transfer)) - - assert res.status_code == 400 - - -@pytest.mark.usefixtures('inputs') -def test_post_invalid_transfer_transaction_returns_400(b, client, user_vk, user_sk): - to_keypair = crypto.generate_key_pair() - input_valid = b.get_owned_ids(user_vk).pop() - transfer = b.create_transaction(user_vk, to_keypair[0], input_valid, 'TRANSFER') + transfer = b.create_transaction(user_vk, vk, input_valid, 'TRANSFER') # transfer is not signed res = client.post(TX_ENDPOINT, data=json.dumps(transfer))