feat: Updating protobuf generation to new version

vegaprotocol · Aug 16, 2022 · b56c726 · b56c726
1 parent a0006dd
commit b56c726
Show file tree

Hide file tree

Showing 29 changed files with 2,328 additions and 10,990 deletions.
diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ build_deps_ui:
 build_proto: pull_deps
 	@rm -rf ./vega_sim/proto
 	@mkdir ./vega_sim/proto
-	@python -m grpc_tools.protoc -I ${EXTERN_DIR}/vega/protos/sources --python_out=vega_sim/proto --grpc_python_out=vega_sim/proto $(shell find ${EXTERN_DIR}/vega/protos/sources -name '*.proto')
+	@buf generate extern/vega/protos/sources 
 	@GENERATED_DIR=./vega_sim/proto scripts/post-generate.sh
 
 .PHONY: black

diff --git a/buf.gen.yaml b/buf.gen.yaml
@@ -0,0 +1,7 @@
+---
+version: v1
+plugins:
+  - remote: buf.build/protocolbuffers/plugins/python
+    out: ./vega_sim/proto
+  - remote: buf.build/grpc/plugins/python
+    out: ./vega_sim/proto
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,6 +23,7 @@ matplotlib = {version = "^3.5.2", optional = true}
 snakeviz = {version = "^2.1.1", optional = true}
 pytest-profiling = {version = "^1.7.0", optional = true}
 ipywidgets = {version = "^7.7.1", extras = ["plotly"]}
+grpc-gateway-protoc-gen-openapiv2 = "^0.1.0"
 
 [tool.poetry.dev-dependencies]
 black = "^22.3.0"

diff --git a/tests/vega_sim/api/test_data.py b/tests/vega_sim/api/test_data.py
@@ -104,19 +104,19 @@ def Assets(self, request, context):
                 vega_protos.assets.Asset(
                     id="asset1_id",
                     details=vega_protos.assets.AssetDetails(
-                        name="asset1", symbol="A1", total_supply="1000000", decimals=5
+                        name="asset1", symbol="A1", decimals=5
                     ),
                 ),
                 vega_protos.assets.Asset(
                     id="asset2_id",
                     details=vega_protos.assets.AssetDetails(
-                        name="asset2", symbol="A2", total_supply="1000000", decimals=5
+                        name="asset2", symbol="A2", decimals=5
                     ),
                 ),
                 vega_protos.assets.Asset(
                     id="asset3_id",
                     details=vega_protos.assets.AssetDetails(
-                        name="asset3", symbol="A3", total_supply="1000000", decimals=5
+                        name="asset3", symbol="A3", decimals=5
                     ),
                 ),
             ]

diff --git a/vega_sim/api/governance.py b/vega_sim/api/governance.py
@@ -353,7 +353,6 @@ def propose_asset(
     wallet: Wallet,
     name: str,
     symbol: str,
-    total_supply: int,
     decimals: int,
     data_client: vac.VegaTradingDataClient,
     quantum: int = 1,
@@ -366,7 +365,6 @@ def propose_asset(
     asset_detail = vega_protos.assets.AssetDetails(
         name=name,
         symbol=symbol,
-        total_supply=str(int(total_supply)),
         decimals=decimals,
         quantum=str(int(quantum)),
         builtin_asset=vega_protos.assets.BuiltinAsset(

diff --git a/vega_sim/proto/data_node/api/v1/trading_data_pb2.py b/vega_sim/proto/data_node/api/v1/trading_data_pb2.py
diff --git a/vega_sim/proto/data_node/api/v2/trading_data_pb2.py b/vega_sim/proto/data_node/api/v2/trading_data_pb2.py