From 7b577c7ae9eee301628e2034c62465f9f6fee371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20L=C3=B6nnhager?= Date: Mon, 21 Oct 2024 14:58:30 +0200 Subject: [PATCH] Replace maybenot machines with v2 machines Co-authored-by: Joakim Hulthe --- dist-assets/maybenot_machines | 8 ++++---- dist-assets/maybenot_machines_v2 | 4 ---- gui/tasks/distribution.js | 2 +- talpid-wireguard/src/wireguard_nt/daita.rs | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) delete mode 100644 dist-assets/maybenot_machines_v2 diff --git a/dist-assets/maybenot_machines b/dist-assets/maybenot_machines index 87e72c4562a2..dfebed89bda8 100644 --- a/dist-assets/maybenot_machines +++ b/dist-assets/maybenot_machines @@ -1,4 +1,4 @@ -789cd5cfbb0900200c04d08b833886adb889389f5bb9801be811acb58ae2837ce02010c158b070555c9538b6377a64dbb0ceff242c20b79038507dd169fbede9f629bf6f021efa1b66 -789cedd0510a401110856153f665ffbbb1030e991735717890f8eabae22f35e252e31a6c2b6c2bf158ce88010b61b69fed14db7fabd8498ffad17d8fedbf5decc4adde3ab7b0fddb045fa153d3ff09ecdb6c7faf0cd04322e8 -789cedd1510a80200c80617de95addff36dda096e84b209bfe0f1bb40f32297f1056cbdd954eb68d6c9b7ac8e2e33a650176fbdd6ea07df24227b7daaf9effa27df2462768edade766689fa2a093d47aedbf86f6291a3ad1593ffb6e45fb4454795e630ae31d11bd1bedffeb0151b22c62 -789cedd2bd4b82411c07f07b2a48846a089a326889861a9c2452ee12221e0ca2a5201ca5a122fc0bda042544370771f3159c9c0405e51914e45c5414df7d441075f00515c4c553f0117906075f40f0331c77c7ddef8efb1e05a6de8e6f3d96661392ee1c6a9f349b72e6316a6e542c4c980b5dbb24cfbbcccefa1d00d57df145ff44079506a677adacc29623a4780f30288a312e99440f809a7d9b457c4711a1b8cf7249ea2adf75cb698e1b4fb50f19dc4d67e0c95d12d354186ab3b1e74f5b9ab7aecc4e70f332e918bfdef6db03ce9042a2bba491e88324629022ef85a6f1aa95a3ece0efcb5f5223012039997e3b726455cb84a9f82322db96f6ff531dbada6558bb120bdce79915bf6c6bc5f51659febc1141265ee0 +02eNptjLsNwCAQQ++yQRZImTJlRIfYBDEJA7ERJQtQ0iC+dxSIJ1mWLcv5TsLH9wMmF4KLqwkRAawk2yPR00CHX3V3j1GziWvE09NBBWg9Fjk= +02eNqFjLENwCAMBP8hC2SJlKnTsVr2zBKUaVACNgiBEJxknex/Oezv9fjjRCF8mXLY4pAEbpeFJFlFqJBGA7PqWQ3spCer4l3rnvGDH6+FGlE= +02eNqFjDkOgDAMBL056PkEJTVdvsY/+URKmojDmwiBUDyStbJ35DLuy5anWRrlqLTDcA0AkTXVkDt01ZAHwLFwludZeMsLLILlRRax4+lKcnrnl/8HJzqIIG0= +02eNpdjr0LQVEYxt9zGES5o4myKVksFM45lEHKx0LJYDAZ5C+QRTHIaGETViYDKYPp3ijFYLj3KkmGK2WwuVwiv3rrrafnA1Jm16ijKBQ+6NRDGPJ2E0Xe6YnAD0hFD9nm/ObIHumlv4imZ3Mm8DwvtaxB0Jy1IUex0pYIIB30lhuCYkYvwW6nQFSV41R1L8vkmwlgEOONVvEaYt1SwLhdhxn8gdBgEfXU7RFmzeR9YtPPxrbqOVkLsd29XJhIJfbqRomGheLcYUWeFgxQodrq9wcP1E88/w== diff --git a/dist-assets/maybenot_machines_v2 b/dist-assets/maybenot_machines_v2 deleted file mode 100644 index dfebed89bda8..000000000000 --- a/dist-assets/maybenot_machines_v2 +++ /dev/null @@ -1,4 +0,0 @@ -02eNptjLsNwCAQQ++yQRZImTJlRIfYBDEJA7ERJQtQ0iC+dxSIJ1mWLcv5TsLH9wMmF4KLqwkRAawk2yPR00CHX3V3j1GziWvE09NBBWg9Fjk= -02eNqFjLENwCAMBP8hC2SJlKnTsVr2zBKUaVACNgiBEJxknex/Oezv9fjjRCF8mXLY4pAEbpeFJFlFqJBGA7PqWQ3spCer4l3rnvGDH6+FGlE= -02eNqFjDkOgDAMBL056PkEJTVdvsY/+URKmojDmwiBUDyStbJ35DLuy5anWRrlqLTDcA0AkTXVkDt01ZAHwLFwludZeMsLLILlRRax4+lKcnrnl/8HJzqIIG0= -02eNpdjr0LQVEYxt9zGES5o4myKVksFM45lEHKx0LJYDAZ5C+QRTHIaGETViYDKYPp3ijFYLj3KkmGK2WwuVwiv3rrrafnA1Jm16ijKBQ+6NRDGPJ2E0Xe6YnAD0hFD9nm/ObIHumlv4imZ3Mm8DwvtaxB0Jy1IUex0pYIIB30lhuCYkYvwW6nQFSV41R1L8vkmwlgEOONVvEaYt1SwLhdhxn8gdBgEfXU7RFmzeR9YtPPxrbqOVkLsd29XJhIJfbqRomGheLcYUWeFgxQodrq9wcP1E88/w== diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index a82366bb76d6..50e4e0ad941b 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -179,7 +179,7 @@ const config = { ), to: '.', }, - { from: distAssets('maybenot_machines_v2'), to: '.' }, + { from: distAssets('maybenot_machines'), to: '.' }, ], }, diff --git a/talpid-wireguard/src/wireguard_nt/daita.rs b/talpid-wireguard/src/wireguard_nt/daita.rs index 88c16c6a9140..1c60b3aaf888 100644 --- a/talpid-wireguard/src/wireguard_nt/daita.rs +++ b/talpid-wireguard/src/wireguard_nt/daita.rs @@ -251,7 +251,7 @@ impl Machinist { static MAYBENOT_MACHINES: OnceCell> = OnceCell::new(); let machines = MAYBENOT_MACHINES.get_or_try_init(|| { - let path = resource_dir.join("maybenot_machines_v2"); + let path = resource_dir.join("maybenot_machines"); log::debug!("Reading maybenot machines from {}", path.display()); let mut machines = vec![];