test multiple products

Author: jhunsaker

pyth/tests/conftest.py

@@ -110,6 +110,31 @@ def run_test(self, input_path: str, output_path: str, *, inplace: bool):
             assert actual == expected
 
 
+PRODUCTS = {
+    'BTC': {
+        'symbol': 'BTC/USD',
+        'asset_type': 'Crypto',
+        'country': 'US',
+        'quote_currency': 'USD',
+        'tenor': 'Spot',
+    },
+    'ETH': {
+        'symbol': 'ETH/USD',
+        'asset_type': 'Crypto',
+        'country': 'US',
+        'quote_currency': 'USD',
+        'tenor': 'Spot',
+    },
+    'LTC': {
+        'symbol': 'LTC/USD',
+        'asset_type': 'Crypto',
+        'country': 'US',
+        'quote_currency': 'USD',
+        'tenor': 'Spot',
+    },
+}
+
+
 @pytest.fixture(scope='session')
 def solana_test_validator():
 
@@ -220,35 +245,33 @@ def pyth_init_mapping(
 @pytest.fixture(scope='session')
 def pyth_add_product(solana_test_validator, pyth_dir, pyth_init_mapping):
 
-    cmd = [
-        'pyth_admin', 'add_product',
-        '-r', 'localhost',
-        '-k', pyth_dir,
-        '-c', 'finalized',
-    ]
-    output = check_output(cmd)
-    output = output.decode('ascii')
-    output = output.splitlines()
-    return output[0]
+    result = {}
+    for product in PRODUCTS.keys():
+        cmd = [
+            'pyth_admin', 'add_product',
+            '-r', 'localhost',
+            '-k', pyth_dir,
+            '-c', 'finalized',
+        ]
+        output = check_output(cmd)
+        output = output.decode('ascii')
+        output = output.splitlines()
+        result[product] = output[0]
+    return result
 
 
 @pytest.fixture(scope='session')
 def pyth_init_product(solana_test_validator, pyth_dir, pyth_add_product):
 
-    ltc = {
-        'account': pyth_add_product,
-        'attr_dict': {
-            'symbol': 'LTC/USD',
-            'asset_type': 'Crypto',
-            'country': 'US',
-            'quote_currency': 'USD',
-            'tenor': 'Spot',
-            'jlqd_symbol': 'LTCUSD',
-        },
-    }
-    fd, path = mkstemp(suffix='.json', prefix='ltc_')
+    products = []
+    for product in pyth_add_product.keys():
+        products.append({
+            'account': pyth_add_product[product],
+            'attr_dict': PRODUCTS[product],
+        })
+    fd, path = mkstemp(suffix='.json', prefix='products_')
     with fdopen(fd, 'w') as f:
-        json.dump([ltc], f)
+        json.dump(products, f)
     cmd = [
         'pyth_admin', 'upd_product', path,
         '-r', 'localhost',
@@ -263,32 +286,36 @@ def pyth_init_product(solana_test_validator, pyth_dir, pyth_add_product):
 @pytest.fixture(scope='session')
 def pyth_add_price(solana_test_validator, pyth_dir, pyth_init_product):
 
-    cmd = [
-        'pyth_admin', 'add_price',
-        pyth_init_product, 'price', '-e', '-5',
-        '-r', 'localhost',
-        '-k', pyth_dir,
-        '-c', 'finalized',
-        '-n',
-    ]
-    output = check_output(cmd)
-    output = output.decode('ascii')
-    output = output.splitlines()
-    return output[0]
-
-
-@pytest.fixture(scope='session')
+    result = {}
+    for product, key in pyth_init_product.items():
+        cmd = [
+            'pyth_admin', 'add_price',
+            key, 'price', '-e', '-5',
+            '-r', 'localhost',
+            '-k', pyth_dir,
+            '-c', 'finalized',
+            '-n',
+        ]
+        output = check_output(cmd)
+        output = output.decode('ascii')
+        output = output.splitlines()
+        result[product] = output[0]
+    return result
+
+
+@pytest.fixture(scope='function')
 def pyth_init_price(solana_test_validator, pyth_dir, pyth_add_price):
 
-    cmd = [
-        'pyth_admin', 'init_price',
-        pyth_add_price, '-e', '-5',
-        '-r', 'localhost',
-        '-k', pyth_dir,
-        '-c', 'finalized',
-        '-n',
-    ]
-    check_call(cmd)
+    for product, key in pyth_add_price.items():
+        cmd = [
+            'pyth_admin', 'init_price',
+            key, '-e', '-5',
+            '-r', 'localhost',
+            '-k', pyth_dir,
+            '-c', 'finalized',
+            '-n',
+        ]
+        check_call(cmd)
     return pyth_add_price
 
 

pyth/tests/test_get_product.py

@@ -2,6 +2,9 @@
 import json
 import websockets
 
+from pyth.tests.conftest import PRODUCTS
+
+
 def test_get_product_list(solana_test_validator, pythd, pyth_init_price):
 
     data = {
@@ -10,6 +13,7 @@ def test_get_product_list(solana_test_validator, pythd, pyth_init_price):
       'method': 'get_product_list',
     }
     data = json.dumps(data)
+
     async def f():
         async with websockets.connect('ws://localhost:8910/') as ws:
             await ws.send(data)
@@ -18,20 +22,13 @@ async def f():
     result = asyncio.run(f())
     result = json.loads(result)
     result = result['result']
-    result = result[0]
+    result = result[2]
     del result['account']  # TODO
     expected_result = {
-        'attr_dict': {
-            'symbol': 'LTC/USD',
-            'asset_type': 'Crypto',
-            'country': 'US',
-            'quote_currency': 'USD',
-            'tenor': 'Spot',
-            'jlqd_symbol': 'LTCUSD',
-        },
+        'attr_dict': PRODUCTS['LTC'],
         'price': [
             {
-                'account': pyth_init_price,
+                'account': pyth_init_price['LTC'],
                 'price_exponent': -5,
                 'price_type': 'price',
             },