From 636f36ebad52d6cf61d959b2d47908b3ea14cc14 Mon Sep 17 00:00:00 2001 From: Oleg Silkin Date: Wed, 12 Jun 2019 20:25:32 -0400 Subject: [PATCH] Moves get_channel,get_stream out of Class into their own functions --- tests/unit/wallet/test_schema_signing.py | 46 ++++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/unit/wallet/test_schema_signing.py b/tests/unit/wallet/test_schema_signing.py index c849ac502..7211aa928 100644 --- a/tests/unit/wallet/test_schema_signing.py +++ b/tests/unit/wallet/test_schema_signing.py @@ -25,47 +25,47 @@ def get_tx(): return Transaction().add_inputs([get_input()]) +def get_channel(claim_name='@foo'): + channel_txo = Output.pay_claim_name_pubkey_hash(CENT, claim_name, Claim(), b'abc') + channel_txo.generate_channel_private_key() + get_tx().add_outputs([channel_txo]) + return channel_txo + + +def get_stream(claim_name='foo'): + stream_txo = Output.pay_claim_name_pubkey_hash(CENT, claim_name, Claim(), b'abc') + get_tx().add_outputs([stream_txo]) + return stream_txo + + class TestSigningAndValidatingClaim(AsyncioTestCase): - @staticmethod - def get_channel(): - channel_txo = Output.pay_claim_name_pubkey_hash(CENT, '@foo', Claim(), b'abc') - channel_txo.generate_channel_private_key() - get_tx().add_outputs([channel_txo]) - return channel_txo - - @staticmethod - def get_stream(): - stream_txo = Output.pay_claim_name_pubkey_hash(CENT, 'foo', Claim(), b'abc') - get_tx().add_outputs([stream_txo]) - return stream_txo - def test_successful_create_sign_and_validate(self): - channel = self.get_channel() - stream = self.get_stream() + channel = get_channel() + stream = get_stream() stream.sign(channel) self.assertTrue(stream.is_signed_by(channel)) def test_fail_to_validate_on_wrong_channel(self): - stream = self.get_stream() - stream.sign(self.get_channel()) - self.assertFalse(stream.is_signed_by(self.get_channel())) + stream = get_stream() + stream.sign(get_channel()) + self.assertFalse(stream.is_signed_by(get_channel())) def test_fail_to_validate_altered_claim(self): - channel = self.get_channel() - stream = self.get_stream() + channel = get_channel() + stream = get_stream() stream.sign(channel) self.assertTrue(stream.is_signed_by(channel)) stream.claim.stream.title = 'hello' self.assertFalse(stream.is_signed_by(channel)) def test_valid_private_key_for_cert(self): - channel = self.get_channel() + channel = get_channel() self.assertTrue(channel.is_channel_private_key(channel.private_key)) def test_fail_to_load_wrong_private_key_for_cert(self): - channel = self.get_channel() - self.assertFalse(channel.is_channel_private_key(self.get_channel().private_key)) + channel = get_channel() + self.assertFalse(channel.is_channel_private_key(get_channel().private_key)) class TestValidatingOldSignatures(AsyncioTestCase):