From c94e41d393c5ccf366d05e4009640aa7598d82f0 Mon Sep 17 00:00:00 2001
From: Sorunome <mail@sorunome.de>
Date: Thu, 4 Jun 2020 18:16:22 +0200
Subject: [PATCH] fix tests for real

---
 lib/encryption/olm_manager.dart | 5 +----
 test/client_test.dart           | 4 ++--
 test/fake_matrix_api.dart       | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/encryption/olm_manager.dart b/lib/encryption/olm_manager.dart
index 648f2b7..218162f 100644
--- a/lib/encryption/olm_manager.dart
+++ b/lib/encryption/olm_manager.dart
@@ -179,12 +179,9 @@ class OlmManager {
           : null,
       oneTimeKeys: signedOneTimeKeys,
     );
-    if (response['signed_curve25519'] != oneTimeKeysCount) {
-      return false;
-    }
     _olmAccount.mark_keys_as_published();
     await client.database?.updateClientKeys(pickledOlmAccount, client.id);
-    return true;
+    return response['signed_curve25519'] == oneTimeKeysCount;
   }
 
   void handleDeviceOneTimeKeysCount(Map<String, int> countJson) {
diff --git a/test/client_test.dart b/test/client_test.dart
index eaded69..47ae597 100644
--- a/test/client_test.dart
+++ b/test/client_test.dart
@@ -159,7 +159,7 @@ void main() {
       expect(presenceCounter, 1);
       expect(accountDataCounter, 3);
       await Future.delayed(Duration(milliseconds: 50));
-      expect(matrix.userDeviceKeys.length, 3);
+      expect(matrix.userDeviceKeys.length, 4);
       expect(matrix.userDeviceKeys['@alice:example.com'].outdated, false);
       expect(matrix.userDeviceKeys['@alice:example.com'].deviceKeys.length, 2);
       expect(
@@ -178,7 +178,7 @@ void main() {
         }
       }));
       await Future.delayed(Duration(milliseconds: 50));
-      expect(matrix.userDeviceKeys.length, 2);
+      expect(matrix.userDeviceKeys.length, 3);
       expect(matrix.userDeviceKeys['@alice:example.com'].outdated, true);
 
       await matrix.handleSync(SyncUpdate.fromJson({
diff --git a/test/fake_matrix_api.dart b/test/fake_matrix_api.dart
index e2f8524..2fec6b9 100644
--- a/test/fake_matrix_api.dart
+++ b/test/fake_matrix_api.dart
@@ -1598,7 +1598,7 @@ class FakeMatrixApi extends MockClient {
       '/client/r0/keys/upload': (var req) => {
             'one_time_key_counts': {
               'curve25519': 10,
-              'signed_curve25519': 66,
+              'signed_curve25519': json.decode(req)['one_time_keys']?.keys?.length ?? 0,
             }
           },
       '/client/r0/keys/query': (var req) => {