Skip to content

Commit

Permalink
Merge branch 'develop' into issue/358
Browse files Browse the repository at this point in the history
  • Loading branch information
cdummett committed Mar 24, 2023
2 parents 9fecec3 + c43a245 commit 07d29d4
Show file tree
Hide file tree
Showing 14 changed files with 677 additions and 599 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VEGA_SIM_VEGA_TAG=15df8ef44f7fe91845eaa8669be89493e0249b26
VEGA_SIM_VEGA_TAG=6d2caf7255339f610ffdb53a68ce3e6c60e7f2be
VEGA_SIM_CONSOLE_TAG=develop
VEGA_DEFAULT_KEY_NAME='Key 1'
VEGA_SIM_NETWORKS_INTERNAL_TAG=main
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pipeline {
timeout(time: 50, unit: 'MINUTES')
}
parameters {
string( name: 'VEGA_VERSION', defaultValue: '15df8ef44f7fe91845eaa8669be89493e0249b26',
string( name: 'VEGA_VERSION', defaultValue: '6d2caf7255339f610ffdb53a68ce3e6c60e7f2be',
description: 'Git branch, tag or hash of the vegaprotocol/vega repository')
string( name: 'JENKINS_SHARED_LIB_BRANCH', defaultValue: 'main',
description: 'Git branch, tag or hash of the vegaprotocol/jenkins-shared-library repository')
Expand Down
9 changes: 9 additions & 0 deletions tests/integration/test_fuzz.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import pytest


@pytest.mark.integration
def test_fuzz_run():
# Simply testing that it doesn't error
import vega_sim.scenario.fuzzed_markets.run_fuzz_test as fuzz

fuzz._run(steps=50, output=True)
14 changes: 9 additions & 5 deletions vega_sim/api/data_raw.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,19 @@ def list_orders(
_type_: _description_
"""

request = data_node_protos_v2.trading_data.ListOrdersRequest(live_only=live_only)
order_filter = data_node_protos_v2.trading_data.OrderFilter(live_only=live_only)

if reference is not None:
order_filter.reference = reference

for attr, val in [
("market_id", market_id),
("party_id", party_id),
("reference", reference),
("market_ids", [market_id] if market_id is not None else None),
("party_ids", [party_id] if party_id is not None else None),
]:
if val is not None:
setattr(request, attr, val)
getattr(order_filter, attr).extend(val)

request = data_node_protos_v2.trading_data.ListOrdersRequest(filter=order_filter)

return unroll_v2_pagination(
base_request=request,
Expand Down
4 changes: 2 additions & 2 deletions vega_sim/proto/blockexplorer/blockexplorer_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,052 changes: 529 additions & 523 deletions vega_sim/proto/data_node/api/v2/trading_data_pb2.py

Large diffs are not rendered by default.

48 changes: 48 additions & 0 deletions vega_sim/proto/data_node/api/v2/trading_data_pb2_grpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,11 @@ def __init__(self, channel):
request_serializer=data__node_dot_api_dot_v2_dot_trading__data__pb2.NetworkHistoryBootstrapPeersRequest.SerializeToString,
response_deserializer=data__node_dot_api_dot_v2_dot_trading__data__pb2.NetworkHistoryBootstrapPeersResponse.FromString,
)
self.ListEntities = channel.unary_unary(
"/datanode.api.v2.TradingDataService/ListEntities",
request_serializer=data__node_dot_api_dot_v2_dot_trading__data__pb2.ListEntitiesRequest.SerializeToString,
response_deserializer=data__node_dot_api_dot_v2_dot_trading__data__pb2.ListEntitiesResponse.FromString,
)
self.Ping = channel.unary_unary(
"/datanode.api.v2.TradingDataService/Ping",
request_serializer=data__node_dot_api_dot_v2_dot_trading__data__pb2.PingRequest.SerializeToString,
Expand Down Expand Up @@ -1269,6 +1274,15 @@ def NetworkHistoryBootstrapPeers(self, request, context):
context.set_details("Method not implemented!")
raise NotImplementedError("Method not implemented!")

def ListEntities(self, request, context):
"""All entities list
List all entities created by transaction hash
"""
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
context.set_details("Method not implemented!")
raise NotImplementedError("Method not implemented!")

def Ping(self, request, context):
"""Ping
Expand Down Expand Up @@ -1711,6 +1725,11 @@ def add_TradingDataServiceServicer_to_server(servicer, server):
request_deserializer=data__node_dot_api_dot_v2_dot_trading__data__pb2.NetworkHistoryBootstrapPeersRequest.FromString,
response_serializer=data__node_dot_api_dot_v2_dot_trading__data__pb2.NetworkHistoryBootstrapPeersResponse.SerializeToString,
),
"ListEntities": grpc.unary_unary_rpc_method_handler(
servicer.ListEntities,
request_deserializer=data__node_dot_api_dot_v2_dot_trading__data__pb2.ListEntitiesRequest.FromString,
response_serializer=data__node_dot_api_dot_v2_dot_trading__data__pb2.ListEntitiesResponse.SerializeToString,
),
"Ping": grpc.unary_unary_rpc_method_handler(
servicer.Ping,
request_deserializer=data__node_dot_api_dot_v2_dot_trading__data__pb2.PingRequest.FromString,
Expand Down Expand Up @@ -4221,6 +4240,35 @@ def NetworkHistoryBootstrapPeers(
metadata,
)

@staticmethod
def ListEntities(
request,
target,
options=(),
channel_credentials=None,
call_credentials=None,
insecure=False,
compression=None,
wait_for_ready=None,
timeout=None,
metadata=None,
):
return grpc.experimental.unary_unary(
request,
target,
"/datanode.api.v2.TradingDataService/ListEntities",
data__node_dot_api_dot_v2_dot_trading__data__pb2.ListEntitiesRequest.SerializeToString,
data__node_dot_api_dot_v2_dot_trading__data__pb2.ListEntitiesResponse.FromString,
options,
channel_credentials,
insecure,
call_credentials,
compression,
wait_for_ready,
timeout,
metadata,
)

@staticmethod
def Ping(
request,
Expand Down
Loading

0 comments on commit 07d29d4

Please sign in to comment.