Merge 2b68c25 into 6ac6fbd

TokTok · Mar 27, 2020 · 7651f83 · 7651f83
2 parents 6ac6fbd + 2b68c25
commit 7651f83
Show file tree

Hide file tree

Showing 91 changed files with 298 additions and 519 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,20 +5,24 @@ os: linux
 
 cache:
   directories:
+    - $HOME/.local
     - $HOME/.stack
 
-addons:
-  apt:
-    packages:
-      - libsodium-dev
-
 before_install:
   - export PATH=$HOME/.local/bin:$PATH
   - travis_retry curl -L https://github.com/TokTok/hs-tools/releases/download/v0.6/hs-tools-v0.6.tar.gz | tar xz -C $HOME
 
+install:
+  # Where to find libraries.
+  - export LD_LIBRARY_PATH=$HOME/.local/lib
+  - export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig
+  # libsodium
+  - git clone --depth=1 --branch=stable https://github.com/jedisct1/libsodium
+  - test -f $HOME/.local/lib/libsodium.so || (cd libsodium && ./configure --prefix=$HOME/.local && make install -j$(nproc))
+
 script:
   - hlint .
   - stylish-haskell-lhs -i .
   - git diff --exit-code
-  - stack --no-terminal test --coverage
-  - shc hstox testsuite
+  - stack --no-terminal test --coverage --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib
+  - shc toxcore testsuite
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,23 +1,23 @@
 load("@ai_formation_hazel//tools:mangling.bzl", "hazel_library")
-load("@rules_haskell//haskell:defs.bzl", "haskell_library", "haskell_test")
-load("//third_party/haskell/hspec-discover:build_defs.bzl", "hspec_library")
+load("@rules_haskell//haskell:defs.bzl", "haskell_library")
+load("//third_party/haskell/hspec-discover:build_defs.bzl", "hspec_test")
 load("//tools/project:build_defs.bzl", "project")
 
 project()
 
 haskell_library(
     name = "hs-toxcore",
-    srcs = glob(["src/tox/**/*.*hs"]),
+    srcs = glob(["src/**/*.*hs"]),
     compiler_flags = [
         "-j4",
         "-Wno-unused-imports",
     ],
-    src_strip_prefix = "src/tox",
-    version = "0.0.2",
+    src_strip_prefix = "src",
+    version = "0.2.11",
     visibility = ["//visibility:public"],
     deps = [
-        "//hs-msgpack",
-        "//hs-msgpack-rpc",
+        "//hs-msgpack-binary",
+        "//hs-msgpack-rpc-conduit",
         hazel_library("MonadRandom"),
         hazel_library("QuickCheck"),
         hazel_library("base"),
@@ -39,20 +39,20 @@ haskell_library(
     ],
 )
 
-hspec_library(
+hspec_test(
     name = "testsuite",
+    size = "small",
     compiler_flags = [
         "-j4",
         "-Wno-unused-imports",
     ],
-    src_strip_prefix = "src/testsuite",
-    version = "0.0.2",
     deps = [
         ":hs-toxcore",
-        "//hs-msgpack",
-        "//hs-msgpack-rpc",
+        "//hs-msgpack-binary",
+        "//hs-msgpack-rpc-conduit",
         "//hs-msgpack-types",
         hazel_library("QuickCheck"),
+        hazel_library("async"),
         hazel_library("base"),
         hazel_library("binary"),
         hazel_library("binary-bits"),
@@ -64,16 +64,3 @@ hspec_library(
         hazel_library("text"),
     ],
 )
-
-haskell_test(
-    name = "test",
-    srcs = glob(["test/**/*.*hs"]),
-    compiler_flags = ["-Wno-unused-imports"],
-    src_strip_prefix = "test",
-    deps = [
-        ":hs-toxcore",
-        ":testsuite",
-        hazel_library("async"),
-        hazel_library("base"),
-    ],
-)
diff --git a/src/tox/Network/Tox.lhs → src/Network/Tox.lhs b/src/tox/Network/Tox.lhs → src/Network/Tox.lhs
diff --git a/...ox/Network/Tox/Application/GroupChats.lhs → src/Network/Tox/Application/GroupChats.lhs b/...ox/Network/Tox/Application/GroupChats.lhs → src/Network/Tox/Application/GroupChats.lhs
diff --git a/src/tox/Network/Tox/Binary.hs → src/Network/Tox/Binary.hs b/src/tox/Network/Tox/Binary.hs → src/Network/Tox/Binary.hs
diff --git a/src/tox/Network/Tox/Crypto.lhs → src/Network/Tox/Crypto.lhs b/src/tox/Network/Tox/Crypto.lhs → src/Network/Tox/Crypto.lhs
diff --git a/src/tox/Network/Tox/Crypto/Box.lhs → src/Network/Tox/Crypto/Box.lhs b/src/tox/Network/Tox/Crypto/Box.lhs → src/Network/Tox/Crypto/Box.lhs
diff --git a/src/tox/Network/Tox/Crypto/CombinedKey.lhs → src/Network/Tox/Crypto/CombinedKey.lhs b/src/tox/Network/Tox/Crypto/CombinedKey.lhs → src/Network/Tox/Crypto/CombinedKey.lhs
diff --git a/src/tox/Network/Tox/Crypto/Key.lhs → src/Network/Tox/Crypto/Key.lhs b/src/tox/Network/Tox/Crypto/Key.lhs → src/Network/Tox/Crypto/Key.lhs
diff --git a/src/tox/Network/Tox/Crypto/KeyPair.lhs → src/Network/Tox/Crypto/KeyPair.lhs b/src/tox/Network/Tox/Crypto/KeyPair.lhs → src/Network/Tox/Crypto/KeyPair.lhs
@@ -56,10 +56,10 @@ newKeyPair = do
   (sk, pk) <- Sodium.newKeypair
   return $ KeyPair (Key sk) (Key pk)
 
-newKeyPairR :: Rpc.RpcIO (Rpc.Returns KeyPair)
+newKeyPairR :: Rpc.Rpc (Rpc.ReturnsM IO KeyPair)
 newKeyPairR =
-  Rpc.stubsIO "KeyPair.newKeyPair"
-    (Ret "keyPair")
+  Rpc.stubs "KeyPair.newKeyPair"
+    (RetM "keyPair")
     newKeyPair
 
 

diff --git a/src/tox/Network/Tox/Crypto/Keyed.hs → src/Network/Tox/Crypto/Keyed.hs b/src/tox/Network/Tox/Crypto/Keyed.hs → src/Network/Tox/Crypto/Keyed.hs
diff --git a/src/tox/Network/Tox/Crypto/KeyedT.hs → src/Network/Tox/Crypto/KeyedT.hs b/src/tox/Network/Tox/Crypto/KeyedT.hs → src/Network/Tox/Crypto/KeyedT.hs
diff --git a/src/tox/Network/Tox/Crypto/Nonce.lhs → src/Network/Tox/Crypto/Nonce.lhs b/src/tox/Network/Tox/Crypto/Nonce.lhs → src/Network/Tox/Crypto/Nonce.lhs
@@ -31,10 +31,10 @@ import           Network.Tox.Crypto.Key
 newNonce :: IO Nonce
 newNonce = Key <$> Sodium.newNonce
 
-newNonceR :: Rpc.RpcIO (Rpc.Returns Nonce)
+newNonceR :: Rpc.Rpc (Rpc.ReturnsM IO Nonce)
 newNonceR =
-  Rpc.stubsIO "Nonce.newNonce"
-    (Ret "nonce")
+  Rpc.stubs "Nonce.newNonce"
+    (RetM "nonce")
     newNonce
 
 

diff --git a/src/tox/Network/Tox/DHT.lhs → src/Network/Tox/DHT.lhs b/src/tox/Network/Tox/DHT.lhs → src/Network/Tox/DHT.lhs
diff --git a/src/tox/Network/Tox/DHT/ClientList.lhs → src/Network/Tox/DHT/ClientList.lhs b/src/tox/Network/Tox/DHT/ClientList.lhs → src/Network/Tox/DHT/ClientList.lhs
diff --git a/src/tox/Network/Tox/DHT/ClientNode.lhs → src/Network/Tox/DHT/ClientNode.lhs b/src/tox/Network/Tox/DHT/ClientNode.lhs → src/Network/Tox/DHT/ClientNode.lhs
diff --git a/src/tox/Network/Tox/DHT/DhtPacket.lhs → src/Network/Tox/DHT/DhtPacket.lhs b/src/tox/Network/Tox/DHT/DhtPacket.lhs → src/Network/Tox/DHT/DhtPacket.lhs
diff --git a/src/tox/Network/Tox/DHT/DhtRequestPacket.lhs → src/Network/Tox/DHT/DhtRequestPacket.lhs b/src/tox/Network/Tox/DHT/DhtRequestPacket.lhs → src/Network/Tox/DHT/DhtRequestPacket.lhs
diff --git a/src/tox/Network/Tox/DHT/DhtState.lhs → src/Network/Tox/DHT/DhtState.lhs b/src/tox/Network/Tox/DHT/DhtState.lhs → src/Network/Tox/DHT/DhtState.lhs
diff --git a/src/tox/Network/Tox/DHT/Distance.lhs → src/Network/Tox/DHT/Distance.lhs b/src/tox/Network/Tox/DHT/Distance.lhs → src/Network/Tox/DHT/Distance.lhs
diff --git a/src/tox/Network/Tox/DHT/KBuckets.lhs → src/Network/Tox/DHT/KBuckets.lhs b/src/tox/Network/Tox/DHT/KBuckets.lhs → src/Network/Tox/DHT/KBuckets.lhs
diff --git a/src/tox/Network/Tox/DHT/NodeList.lhs → src/Network/Tox/DHT/NodeList.lhs b/src/tox/Network/Tox/DHT/NodeList.lhs → src/Network/Tox/DHT/NodeList.lhs
diff --git a/src/tox/Network/Tox/DHT/NodesRequest.lhs → src/Network/Tox/DHT/NodesRequest.lhs b/src/tox/Network/Tox/DHT/NodesRequest.lhs → src/Network/Tox/DHT/NodesRequest.lhs
diff --git a/src/tox/Network/Tox/DHT/NodesResponse.lhs → src/Network/Tox/DHT/NodesResponse.lhs b/src/tox/Network/Tox/DHT/NodesResponse.lhs → src/Network/Tox/DHT/NodesResponse.lhs
diff --git a/src/tox/Network/Tox/DHT/Operation.lhs → src/Network/Tox/DHT/Operation.lhs b/src/tox/Network/Tox/DHT/Operation.lhs → src/Network/Tox/DHT/Operation.lhs
diff --git a/src/tox/Network/Tox/DHT/PendingReplies.lhs → src/Network/Tox/DHT/PendingReplies.lhs b/src/tox/Network/Tox/DHT/PendingReplies.lhs → src/Network/Tox/DHT/PendingReplies.lhs
diff --git a/src/tox/Network/Tox/DHT/PingPacket.lhs → src/Network/Tox/DHT/PingPacket.lhs b/src/tox/Network/Tox/DHT/PingPacket.lhs → src/Network/Tox/DHT/PingPacket.lhs
diff --git a/src/tox/Network/Tox/DHT/RpcPacket.lhs → src/Network/Tox/DHT/RpcPacket.lhs b/src/tox/Network/Tox/DHT/RpcPacket.lhs → src/Network/Tox/DHT/RpcPacket.lhs
diff --git a/src/tox/Network/Tox/DHT/Stamped.hs → src/Network/Tox/DHT/Stamped.hs b/src/tox/Network/Tox/DHT/Stamped.hs → src/Network/Tox/DHT/Stamped.hs
diff --git a/src/tox/Network/Tox/Encoding.hs → src/Network/Tox/Encoding.hs b/src/tox/Network/Tox/Encoding.hs → src/Network/Tox/Encoding.hs
diff --git a/...x/Network/Tox/Network/MonadRandomBytes.hs → src/Network/Tox/Network/MonadRandomBytes.hs b/...x/Network/Tox/Network/MonadRandomBytes.hs → src/Network/Tox/Network/MonadRandomBytes.hs
diff --git a/src/tox/Network/Tox/Network/Networked.hs → src/Network/Tox/Network/Networked.hs b/src/tox/Network/Tox/Network/Networked.hs → src/Network/Tox/Network/Networked.hs
diff --git a/src/tox/Network/Tox/NodeInfo.lhs → src/Network/Tox/NodeInfo.lhs b/src/tox/Network/Tox/NodeInfo.lhs → src/Network/Tox/NodeInfo.lhs
diff --git a/src/tox/Network/Tox/NodeInfo/HostAddress.lhs → src/Network/Tox/NodeInfo/HostAddress.lhs b/src/tox/Network/Tox/NodeInfo/HostAddress.lhs → src/Network/Tox/NodeInfo/HostAddress.lhs
diff --git a/src/tox/Network/Tox/NodeInfo/NodeInfo.lhs → src/Network/Tox/NodeInfo/NodeInfo.lhs b/src/tox/Network/Tox/NodeInfo/NodeInfo.lhs → src/Network/Tox/NodeInfo/NodeInfo.lhs
diff --git a/src/tox/Network/Tox/NodeInfo/PortNumber.lhs → src/Network/Tox/NodeInfo/PortNumber.lhs b/src/tox/Network/Tox/NodeInfo/PortNumber.lhs → src/Network/Tox/NodeInfo/PortNumber.lhs
diff --git a/...ox/Network/Tox/NodeInfo/SocketAddress.lhs → src/Network/Tox/NodeInfo/SocketAddress.lhs b/...ox/Network/Tox/NodeInfo/SocketAddress.lhs → src/Network/Tox/NodeInfo/SocketAddress.lhs
diff --git a/...etwork/Tox/NodeInfo/TransportProtocol.lhs → ...etwork/Tox/NodeInfo/TransportProtocol.lhs b/...etwork/Tox/NodeInfo/TransportProtocol.lhs → ...etwork/Tox/NodeInfo/TransportProtocol.lhs
diff --git a/src/tox/Network/Tox/Protocol.lhs → src/Network/Tox/Protocol.lhs b/src/tox/Network/Tox/Protocol.lhs → src/Network/Tox/Protocol.lhs
diff --git a/src/tox/Network/Tox/Protocol/Packet.lhs → src/Network/Tox/Protocol/Packet.lhs b/src/tox/Network/Tox/Protocol/Packet.lhs → src/Network/Tox/Protocol/Packet.lhs
diff --git a/src/tox/Network/Tox/Protocol/PacketKind.lhs → src/Network/Tox/Protocol/PacketKind.lhs b/src/tox/Network/Tox/Protocol/PacketKind.lhs → src/Network/Tox/Protocol/PacketKind.lhs
diff --git a/src/tox/Network/Tox/SaveData.lhs → src/Network/Tox/SaveData.lhs b/src/tox/Network/Tox/SaveData.lhs → src/Network/Tox/SaveData.lhs
diff --git a/src/tox/Network/Tox/SaveData/Conferences.lhs → src/Network/Tox/SaveData/Conferences.lhs b/src/tox/Network/Tox/SaveData/Conferences.lhs → src/Network/Tox/SaveData/Conferences.lhs
diff --git a/src/tox/Network/Tox/SaveData/DHT.lhs → src/Network/Tox/SaveData/DHT.lhs b/src/tox/Network/Tox/SaveData/DHT.lhs → src/Network/Tox/SaveData/DHT.lhs
diff --git a/src/tox/Network/Tox/SaveData/Friend.lhs → src/Network/Tox/SaveData/Friend.lhs b/src/tox/Network/Tox/SaveData/Friend.lhs → src/Network/Tox/SaveData/Friend.lhs
diff --git a/src/tox/Network/Tox/SaveData/Nodes.hs → src/Network/Tox/SaveData/Nodes.hs b/src/tox/Network/Tox/SaveData/Nodes.hs → src/Network/Tox/SaveData/Nodes.hs
diff --git a/src/tox/Network/Tox/SaveData/Util.hs → src/Network/Tox/SaveData/Util.hs b/src/tox/Network/Tox/SaveData/Util.hs → src/Network/Tox/SaveData/Util.hs
diff --git a/src/tox/Network/Tox/Testing.lhs → src/Network/Tox/Testing.lhs b/src/tox/Network/Tox/Testing.lhs → src/Network/Tox/Testing.lhs
diff --git a/src/tox/Network/Tox/Time.hs → src/Network/Tox/Time.hs b/src/tox/Network/Tox/Time.hs → src/Network/Tox/Time.hs
diff --git a/src/tox/Network/Tox/Timed.hs → src/Network/Tox/Timed.hs b/src/tox/Network/Tox/Timed.hs → src/Network/Tox/Timed.hs
diff --git a/src/tox/Network/Tox/TimedT.hs → src/Network/Tox/TimedT.hs b/src/tox/Network/Tox/TimedT.hs → src/Network/Tox/TimedT.hs
diff --git a/src/testsuite/Network/Tox/Crypto/CombinedKeySpec.hs b/src/testsuite/Network/Tox/Crypto/CombinedKeySpec.hs
diff --git a/src/testsuite/Network/Tox/Crypto/KeyPairSpec.hs b/src/testsuite/Network/Tox/Crypto/KeyPairSpec.hs
diff --git a/src/testsuite/Network/Tox/RPCTest.hs b/src/testsuite/Network/Tox/RPCTest.hs
diff --git a/src/testsuite/ToxTestSuite.hs b/src/testsuite/ToxTestSuite.hs
diff --git a/src/tox-refsut.hs b/src/tox-refsut.hs