Merge pull request #329 from Agoric/328-timer-monotonicity-fix

fix(timer): don't enforce advancement, just prevent moving backwards
Agoric · Dec 12, 2019 · 027d4b6 · 027d4b6
2 parents 4719b47 + 7a0a509
commit 027d4b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/SwingSet/changelogs/328.txt b/packages/SwingSet/changelogs/328.txt
@@ -0,0 +1,2 @@
+fix timer interface to correspond to doc
+prevent overly strict timer monotonicity
diff --git a/packages/SwingSet/docs/timer.md b/packages/SwingSet/docs/timer.md
@@ -37,8 +37,7 @@ In `bootstrap()` for a particular SwingSet, we create a timerService, and
 make it accessible to the user in `home`
 
 ```
-await vats.timerWrapper~.registerTimerDevice(devices.timer);
-const timerService = vats.timerWrapper~.createTimerService();
+const timerService = vats.timerWrapper~.createTimerService(devices.timer);
 ```
 
 Then users in the REPL can use the timerService to schedule wakeups.

diff --git a/packages/SwingSet/src/devices/timer-src.js b/packages/SwingSet/src/devices/timer-src.js
@@ -214,8 +214,8 @@ export default function setup(syscall, state, helpers, endowments) {
 
     function updateTime(time) {
       insist(
-        time > lastPolled,
-        `Time is monotonic. ${time} must be greater than ${lastPolled}`,
+        time >= lastPolled,
+        `Time is monotonic. ${time} cannot be less than ${lastPolled}`,
       );
       lastPolled = time;
       saveState();
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fix timer interface to correspond to doc
		prevent overly strict timer monotonicity