From aa8aa1ea8f158792e237e2f5f871585c7eb71984 Mon Sep 17 00:00:00 2001 From: lieser Date: Sun, 8 Nov 2020 17:54:39 +0100 Subject: [PATCH] remove versionTable and versionData from default rules --- data/signersDefault-schema.json | 8 -------- data/signersDefault.json | 2 -- modules/dkim/signRules.mjs.js | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/data/signersDefault-schema.json b/data/signersDefault-schema.json index d92f0598..239cb5fd 100644 --- a/data/signersDefault-schema.json +++ b/data/signersDefault-schema.json @@ -5,12 +5,6 @@ "description": "Contains the default sign rules for the DKIM Verifier Thunderbird add-on", "type": "object", "properties": { - "versionTable": { - "type": "number" - }, - "versionData": { - "type": "number" - }, "rules": { "type": "array", "items": { @@ -106,8 +100,6 @@ } }, "required": [ - "versionTable", - "versionData", "rules" ] } diff --git a/data/signersDefault.json b/data/signersDefault.json index 99423744..5bc98c1f 100644 --- a/data/signersDefault.json +++ b/data/signersDefault.json @@ -1,7 +1,5 @@ { "$schema": "./signersDefault-schema.json", - "versionTable": 1, - "versionData": 28, "rules": [ { "domain": "1und1.de", diff --git a/modules/dkim/signRules.mjs.js b/modules/dkim/signRules.mjs.js index 4950384a..806146ff 100644 --- a/modules/dkim/signRules.mjs.js +++ b/modules/dkim/signRules.mjs.js @@ -126,7 +126,7 @@ async function loadDefaultRules() { defaultRulesLoaded = new Deferred(); try { const signersDefaultStr = await ExtensionUtils.readFile("data/signersDefault.json"); - /** @type {{versionTable: number, versionData: number, rules: {domain: string, addr: string, sdid: string, ruletype: string, priority: string}[]}} */ + /** @type {{rules: {domain: string, addr: string, sdid: string, ruletype: string, priority: string}[]}} */ const signersDefaultData = JSON.parse(signersDefaultStr); defaultRules = signersDefaultData.rules.map(function (rule) { /** @type {number=} */