remove deprecated function, remove outdated FIXMEs

1 files changed, 17 insertions, 22 deletions

diff --git a/packages/taler-util/src/time.ts b/packages/taler-util/src/time.ts
index cec41fdd0..2e24856ee 100644
--- a/packages/taler-util/src/time.ts
+++ b/packages/taler-util/src/time.ts
@@ -280,7 +280,23 @@ export namespace Duration {
     return Math.ceil(d.d_ms / 1000 / 60 / 60 / 24 / 365);
   }
 
-  export const fromSpec = durationFromSpec;
+  export function fromSpec(spec: {
+    seconds?: number;
+    minutes?: number;
+    hours?: number;
+    days?: number;
+    months?: number;
+    years?: number;
+  }): Duration {
+    let d_ms = 0;
+    d_ms += (spec.seconds ?? 0) * SECONDS;
+    d_ms += (spec.minutes ?? 0) * MINUTES;
+    d_ms += (spec.hours ?? 0) * HOURS;
+    d_ms += (spec.days ?? 0) * DAYS;
+    d_ms += (spec.months ?? 0) * MONTHS;
+    d_ms += (spec.years ?? 0) * YEARS;
+    return { d_ms };
+  }
 
   export function getForever(): Duration {
     return { d_ms: "forever" };
@@ -552,27 +568,6 @@ const DAYS = HOURS * 24;
 const MONTHS = DAYS * 30;
 const YEARS = DAYS * 365;
 
-/**
- * @deprecated use Duration.fromSpec
- */
-export function durationFromSpec(spec: {
-  seconds?: number;
-  minutes?: number;
-  hours?: number;
-  days?: number;
-  months?: number;
-  years?: number;
-}): Duration {
-  let d_ms = 0;
-  d_ms += (spec.seconds ?? 0) * SECONDS;
-  d_ms += (spec.minutes ?? 0) * MINUTES;
-  d_ms += (spec.hours ?? 0) * HOURS;
-  d_ms += (spec.days ?? 0) * DAYS;
-  d_ms += (spec.months ?? 0) * MONTHS;
-  d_ms += (spec.years ?? 0) * YEARS;
-  return { d_ms };
-}
-
 export function durationMin(d1: Duration, d2: Duration): Duration {
   if (d1.d_ms === "forever") {
     return { d_ms: d2.d_ms };