Refactor Motoko canister file layout (#49)

* Move Motoko library files to 'lib' subdirectory * Rearrange imports
dfinity · Aug 24, 2023 · e86f754 · e86f754
1 parent aa422aa
commit e86f754
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/canisters/backend/Core.mo b/canisters/backend/Core.mo
@@ -1,13 +1,13 @@
 import Types "Types";
 import State "State";
-import System "System";
-import IcEth "canister:ic_eth";
-import Principal "mo:base/Principal";
-import Nat64 "mo:base/Nat64";
 import History "History";
 import Snapshot "Snapshot";
-import Iter "IterMore";
 
+import Principal "mo:base/Principal";
+import Nat64 "mo:base/Nat64";
+import System "lib/System";
+import Iter "lib/IterMore";
+import IcEth "canister:ic_eth";
 import Seq "mo:sequence/Sequence";
 import Stream "mo:sequence/Stream";
 

diff --git a/canisters/backend/History.mo b/canisters/backend/History.mo
@@ -4,8 +4,8 @@ import Int "mo:base/Int";
 import Iter "mo:base/Iter";
 import Seq "mo:sequence/Sequence";
 import Stream "mo:sequence/Stream";
+import System "lib/System";
 
-import System "System";
 import Types "Types";
 
 module {

diff --git a/canisters/backend/Main.mo b/canisters/backend/Main.mo
@@ -1,8 +1,8 @@
+import System "lib/System";
+
 import Types "Types";
 import Core "Core";
 import State "State";
-
-import System "System";
 import History "History";
 import Snapshot "Snapshot";
 

diff --git a/canisters/backend/Snapshot.mo b/canisters/backend/Snapshot.mo
@@ -2,8 +2,8 @@ import Types "Types";
 import State "State";
 
 import Int "mo:base/Int";
-import Iter "IterMore";
 import Trie "mo:base/Trie";
+import Iter "lib/IterMore";
 
 module {
  type EthWallet = Types.EthWallet;

diff --git a/canisters/backend/State.mo b/canisters/backend/State.mo
@@ -1,13 +1,12 @@
 import Types "Types";
-import Relate "Relate";
-import System "System";
 
 import Iter "mo:base/Iter";
 import Principal "mo:base/Principal";
 import Int "mo:base/Int";
-
 import Seq "mo:sequence/Sequence";
 import Stream "mo:sequence/Stream";
+import Relate "lib/Relate";
+import System "lib/System";
 
 module {
 

diff --git a/canisters/backend/Types.mo b/canisters/backend/Types.mo
@@ -1,7 +1,7 @@
 import Text "mo:base/Text";
 import Nat "mo:base/Nat";
 import Hash "mo:base/Hash";
-import System "System";
+import System "lib/System";
 
 module {
 

diff --git a/canisters/backend/IterMore.mo → canisters/backend/lib/IterMore.mo b/canisters/backend/IterMore.mo → canisters/backend/lib/IterMore.mo
diff --git a/canisters/backend/Relate.mo → canisters/backend/lib/Relate.mo b/canisters/backend/Relate.mo → canisters/backend/lib/Relate.mo
diff --git a/canisters/backend/System.mo → canisters/backend/lib/System.mo b/canisters/backend/System.mo → canisters/backend/lib/System.mo