From ccf91075bfc8c54d141783366f4fbbac84e3e15c Mon Sep 17 00:00:00 2001
From: Mark Spanbroek <mark@spanbroek.net>
Date: Wed, 26 Feb 2025 10:36:04 +0100
Subject: [PATCH] vault: move Timestamp and TokensPerSecond libraries one level
 up

---
 contracts/{vault => }/Timestamps.sol           | 0
 contracts/{vault/TokenFlows.sol => Tokens.sol} | 2 +-
 contracts/vault/Accounts.sol                   | 6 +++---
 contracts/vault/Funds.sol                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename contracts/{vault => }/Timestamps.sol (100%)
 rename contracts/{vault/TokenFlows.sol => Tokens.sol} (98%)

diff --git a/contracts/vault/Timestamps.sol b/contracts/Timestamps.sol
similarity index 100%
rename from contracts/vault/Timestamps.sol
rename to contracts/Timestamps.sol
diff --git a/contracts/vault/TokenFlows.sol b/contracts/Tokens.sol
similarity index 98%
rename from contracts/vault/TokenFlows.sol
rename to contracts/Tokens.sol
index d62c38d..83d9553 100644
--- a/contracts/vault/TokenFlows.sol
+++ b/contracts/Tokens.sol
@@ -43,7 +43,7 @@ function _tokensPerSecondAtMost(
   return TokensPerSecond.unwrap(a) <= TokensPerSecond.unwrap(b);
 }
 
-library TokenFlows {
+library Tokens {
   /// Calculates how many tokens are accumulated when a token flow is maintained
   /// for a duration of time.
   function accumulate(
diff --git a/contracts/vault/Accounts.sol b/contracts/vault/Accounts.sol
index 24aff9f..3066e7d 100644
--- a/contracts/vault/Accounts.sol
+++ b/contracts/vault/Accounts.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.28;
 
-import "./TokenFlows.sol";
-import "./Timestamps.sol";
+import "../Tokens.sol";
+import "../Timestamps.sol";
 
 /// Used to identify an account. The first 20 bytes consist of the address of
 /// the account holder, and the last 12 bytes consist of a discriminator value.
@@ -38,7 +38,7 @@ struct Flow {
 
 library Accounts {
   using Accounts for Account;
-  using TokenFlows for TokensPerSecond;
+  using Tokens for TokensPerSecond;
   using Timestamps for Timestamp;
 
   /// Creates an account id from the account holder address and a discriminator.
diff --git a/contracts/vault/Funds.sol b/contracts/vault/Funds.sol
index 8b69c35..471c2d9 100644
--- a/contracts/vault/Funds.sol
+++ b/contracts/vault/Funds.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.28;
 
-import "./Timestamps.sol";
+import "../Timestamps.sol";
 
 struct Fund {
   /// The time-lock unlocks at this time