From 27a5e17a3ef3ec8100475e87344edfcac759ce05 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Wed, 22 Mar 2023 09:52:01 +0100 Subject: [PATCH] proto: rename address value field --- capa/render/proto/capa.proto | 2 +- capa/render/proto/proto.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/capa/render/proto/capa.proto b/capa/render/proto/capa.proto index 645b852b..68cc4567 100644 --- a/capa/render/proto/capa.proto +++ b/capa/render/proto/capa.proto @@ -9,7 +9,7 @@ message APIFeature { message Address { AddressType type = 1; oneof value { - Integer v = 2; // TODO rename value? + Integer value = 2; Token_Offset token_offset = 3; }; } diff --git a/capa/render/proto/proto.py b/capa/render/proto/proto.py index 5a5cbe2f..0eb93883 100644 --- a/capa/render/proto/proto.py +++ b/capa/render/proto/proto.py @@ -79,19 +79,19 @@ def number_to_pb2(v: Union[int, float]) -> capa_pb2.Number: def addr_to_pb2(addr: frz.Address) -> capa_pb2.Address: if addr.type is AddressType.ABSOLUTE: assert isinstance(addr.value, int) - return capa_pb2.Address(type=capa_pb2.AddressType.ADDRESSTYPE_ABSOLUTE, v=int_to_pb2(addr.value)) + return capa_pb2.Address(type=capa_pb2.AddressType.ADDRESSTYPE_ABSOLUTE, value=int_to_pb2(addr.value)) elif addr.type is AddressType.RELATIVE: assert isinstance(addr.value, int) - return capa_pb2.Address(type=capa_pb2.AddressType.ADDRESSTYPE_RELATIVE, v=int_to_pb2(addr.value)) + return capa_pb2.Address(type=capa_pb2.AddressType.ADDRESSTYPE_RELATIVE, value=int_to_pb2(addr.value)) elif addr.type is AddressType.FILE: assert isinstance(addr.value, int) - return capa_pb2.Address(type=capa_pb2.AddressType.ADDRESSTYPE_FILE, v=int_to_pb2(addr.value)) + return capa_pb2.Address(type=capa_pb2.AddressType.ADDRESSTYPE_FILE, value=int_to_pb2(addr.value)) elif addr.type is AddressType.DN_TOKEN: assert isinstance(addr.value, int) - return capa_pb2.Address(type=capa_pb2.AddressType.ADDRESSTYPE_DN_TOKEN, v=int_to_pb2(addr.value)) + return capa_pb2.Address(type=capa_pb2.AddressType.ADDRESSTYPE_DN_TOKEN, value=int_to_pb2(addr.value)) elif addr.type is AddressType.DN_TOKEN_OFFSET: assert isinstance(addr.value, tuple)