From aee61b35e47c6683ddc3415c38da9a4940da53e8 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 5 Apr 2022 10:41:03 -0600 Subject: [PATCH] *: remove more references to /x32 and /x64 --- capa/ida/plugin/model.py | 4 ---- tests/test_render.py | 4 ---- tests/test_rules.py | 2 -- 3 files changed, 10 deletions(-) diff --git a/capa/ida/plugin/model.py b/capa/ida/plugin/model.py index 01161375..bf2267b9 100644 --- a/capa/ida/plugin/model.py +++ b/capa/ida/plugin/model.py @@ -581,10 +581,6 @@ class CapaExplorerDataModel(QtCore.QAbstractItemModel): "mnemonic", "number", "offset", - "number/x32", - "number/x64", - "offset/x32", - "offset/x64", ): # display instruction preview return CapaExplorerInstructionViewItem(parent, display, location) diff --git a/tests/test_render.py b/tests/test_render.py index c6b181e8..313b0029 100644 --- a/tests/test_render.py +++ b/tests/test_render.py @@ -9,14 +9,10 @@ import capa.render.result_document def test_render_number(): assert str(capa.features.insn.Number(1)) == "number(0x1)" - assert str(capa.features.insn.Number(1, bitness=capa.features.common.BITNESS_X32)) == "number/x32(0x1)" - assert str(capa.features.insn.Number(1, bitness=capa.features.common.BITNESS_X64)) == "number/x64(0x1)" def test_render_offset(): assert str(capa.features.insn.Offset(1)) == "offset(0x1)" - assert str(capa.features.insn.Offset(1, bitness=capa.features.common.BITNESS_X32)) == "offset/x32(0x1)" - assert str(capa.features.insn.Offset(1, bitness=capa.features.common.BITNESS_X64)) == "offset/x64(0x1)" def test_render_meta_attack(): diff --git a/tests/test_rules.py b/tests/test_rules.py index 93cc8be6..68afea7d 100644 --- a/tests/test_rules.py +++ b/tests/test_rules.py @@ -108,8 +108,6 @@ def test_rule_descriptions(): - description: and description - and: - description: and description - - offset/x64: 0x50 = offset/x64 description - - offset/x64: 0x30 = offset/x64 description """ ) r = capa.rules.Rule.from_yaml(rule)