Move everything into nitro/protocol

nitro.nim

@@ -1,3 +1,3 @@
-import ./nitro/state
+import ./nitro/protocol
 
-export state
+export protocol

nitro/protocol.nim

@@ -0,0 +1,5 @@
+import ./protocol/state
+import ./protocol/signature
+
+export state
+export signature

nitro/protocol/abi.nim

@@ -1,8 +1,10 @@
 import pkg/stew/endians2
 import pkg/stint
-import ./types
+import ../types
 
-include ./noerrors
+include ../noerrors
+
+export types
 
 type
   AbiEncoder* = object

nitro/protocol/channel.nim

@@ -1,8 +1,8 @@
 import pkg/nimcrypto
+import ../types
 import ./abi
-import ./types
 
-include ./noerrors
+include ../noerrors
 
 export types
 

nitro/protocol/outcome.nim

@@ -1,11 +1,10 @@
 import pkg/nimcrypto
+import ../types
 import ./abi
-import ./types
 
-include ./noerrors
+include ../noerrors
 
 export types
-export abi
 
 type
   Outcome* = distinct seq[AssetOutcome]

nitro/protocol/signature.nim

@@ -2,10 +2,10 @@ import std/options
 import pkg/nimcrypto
 import pkg/secp256k1
 import pkg/stew/byteutils
+import ../helpers
 import ./state
-import ./helpers
 
-include ./noerrors
+include ../noerrors
 
 export options
 export toPublicKey

nitro/protocol/state.nim

@@ -1,10 +1,10 @@
 import pkg/nimcrypto
-import ./types
+import ../types
 import ./channel
 import ./outcome
 import ./abi
 
-include ./noerrors
+include ../noerrors
 
 export types
 export channel

tests/nitro/protocol/testAbi.nim

@@ -1,6 +1,5 @@
 import std/unittest
-import pkg/nitro/abi
-import pkg/nitro/types
+import pkg/nitro/protocol/abi
 import pkg/stint
 import ./examples
 

tests/nitro/protocol/testChannel.nim

@@ -1,6 +1,6 @@
 import std/unittest
-import pkg/nitro/channel
-import pkg/nitro/abi
+import pkg/nitro/protocol/channel
+import pkg/nitro/protocol/abi
 import pkg/nimcrypto
 import pkg/stew/byteutils
 import ./examples

tests/nitro/protocol/testOutcome.nim

@@ -1,7 +1,8 @@
 import std/unittest
 import pkg/nimcrypto
 import pkg/stew/byteutils
-import pkg/nitro/outcome
+import pkg/nitro/protocol/abi
+import pkg/nitro/protocol/outcome
 import ./examples
 
 suite "outcome":

tests/nitro/protocol/testSignature.nim

@@ -2,8 +2,8 @@ import std/unittest
 import pkg/nimcrypto
 import pkg/secp256k1
 import pkg/stew/byteutils
-import pkg/nitro/state
-import pkg/nitro/signature
+import pkg/nitro/protocol/state
+import pkg/nitro/protocol/signature
 import ./examples
 
 suite "signature":

tests/nitro/protocol/testState.nim

@@ -1,9 +1,8 @@
 import std/unittest
 import pkg/nimcrypto
 import pkg/stew/byteutils
-import pkg/nitro
-import pkg/nitro/state
-import pkg/nitro/abi
+import pkg/nitro/protocol/state
+import pkg/nitro/protocol/abi
 import ./examples
 
 suite "state":

tests/testAll.nim

@@ -1,7 +1,7 @@
-import ./nitro/testAbi
-import ./nitro/testChannel
-import ./nitro/testOutcome
-import ./nitro/testState
-import ./nitro/testSignature
+import ./nitro/protocol/testAbi
+import ./nitro/protocol/testChannel
+import ./nitro/protocol/testOutcome
+import ./nitro/protocol/testState
+import ./nitro/protocol/testSignature
 
 {.warning[UnusedImport]: off.}