From 65d44b501d19f1921cfe91e91057d59e4cbaf6ed Mon Sep 17 00:00:00 2001 From: denihs Date: Mon, 30 Jan 2023 11:24:35 -0400 Subject: [PATCH] - fix `livedata - basic method invocation` options.throwThroughFuture was used to fix a bug with errors and fibers (issue #1482). As we don't use Fibers anymore, this won't be needed --- packages/ddp-client/test/livedata_test_service.js | 9 --------- packages/ddp-client/test/livedata_tests.js | 2 -- 2 files changed, 11 deletions(-) diff --git a/packages/ddp-client/test/livedata_test_service.js b/packages/ddp-client/test/livedata_test_service.js index a6075a6de5..c59da5fe54 100644 --- a/packages/ddp-client/test/livedata_test_service.js +++ b/packages/ddp-client/test/livedata_test_service.js @@ -16,7 +16,6 @@ Meteor.methods({ options, Match.Optional({ intended: Match.Optional(Boolean), - throwThroughFuture: Match.Optional(Boolean) }) ); options = options || Object.create(null); @@ -32,14 +31,6 @@ Meteor.methods({ else e = new Error('Test method throwing an exception'); e._expectedByTest = true; - // We used to improperly serialize errors that were thrown through a - // future first. - if (Meteor.isServer && options.throwThroughFuture) { - const Future = Npm.require('fibers/future'); - const f = new Future(); - f['throw'](e); - e = f.wait(); - } throw e; } }, diff --git a/packages/ddp-client/test/livedata_tests.js b/packages/ddp-client/test/livedata_tests.js index 3c181410eb..f0ba610409 100644 --- a/packages/ddp-client/test/livedata_tests.js +++ b/packages/ddp-client/test/livedata_tests.js @@ -314,7 +314,6 @@ testAsyncMulti('livedata - basic method invocation', [ try { await Meteor.callAsync('exception', 'both', { intended: true, - throwThroughFuture: true, }); } catch (e) { threw = true; @@ -349,7 +348,6 @@ testAsyncMulti('livedata - basic method invocation', [ 'server', { intended: true, - throwThroughFuture: true, }, expect(failure(test, 999, 'Client-visible test exception')) ),