[gnunet-scheme] 162/324: Merge branch 'proper-mq'

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a commit to branch master
in repository gnunet-scheme.

commit 551c32209d44519bb817135e4d0ca7806aba97a1
Merge: 7a09b03 8c05c6e
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Jul 20 15:20:45 2021 +0200

    Merge branch 'proper-mq'
    
    The current approach seems reasonable (albeit incomplete).
    
    Conflicts:
            Makefile.am
            guix.scm

 Makefile.am                                   |  22 +-
 README.org                                    |  49 +-
 gnu/gnunet/concurrency/repeated-condition.scm |  95 +++
 gnu/gnunet/message/envelope.scm               | 139 ----
 gnu/gnunet/mq-impl/stream.scm                 | 132 ++++
 gnu/gnunet/mq.scm                             | 393 +++++++++++
 gnu/gnunet/mq/envelope.scm                    | 202 ++++++
 gnu/gnunet/mq/message-io.scm                  | 238 -------
 gnu/gnunet/netstruct/procedural.scm           |  36 +-
 gnu/gnunet/netstruct/syntactic.scm            |   9 +-
 gnu/gnunet/util/struct.scm                    |   4 +
 gnu/gnunet/utils/tokeniser.scm                | 330 +++++++++
 guix.scm                                      |   4 +-
 tests/envelope.scm                            | 459 +++++++++----
 tests/message-io.scm                          | 197 ------
 tests/mq-stream.scm                           | 234 +++++++
 tests/mq.scm                                  | 930 ++++++++++++++++++++++++++
 tests/netstruct.scm                           | 101 +++
 tests/repeated-condition.scm                  | 143 ++++
 tests/tokeniser.scm                           | 549 +++++++++++++++
 tests/utils.scm                               |  56 ++
 21 files changed, 3600 insertions(+), 722 deletions(-)

diff --cc Makefile.am
index 42ff14e,be273bc..8d61084
--- a/Makefile.am
+++ b/Makefile.am
@@@ -104,8 -110,10 +110,10 @@@ SCM_TESTS = 
    tests/cmsg.scm \
    tests/config-parser.scm \
    tests/config-value-parser.scm \
 -  tests/config-expander.scm \
 +  tests/config-expand.scm \
-   tests/config-db.scm
+   tests/config-db.scm \
+   tests/netstruct.scm \
+   tests/tokeniser.scm
  
  SCM_TESTS_ENVIRONMENT = \
    GUILE_AUTO_COMPILE=0 \
diff --cc guix.scm
index 4cdff7f,6db8c36..61753c0
--- a/guix.scm
+++ b/guix.scm
@@@ -76,8 -66,10 +76,10 @@@ random inputs and seeing if it holds."
     (propagated-inputs `(("guile-zlib" ,guile-zlib)
                        ("guile-bytestructures" ,guile-bytestructures)
                        ("guile-fibers" ,guile-fibers)
-                       ("guile-json" ,guile-json-4)))
+                       ("guile-json" ,guile-json-4)
+                       ("guile-pfds" ,guile-pfds)))
 -   (native-inputs `(("guile" ,guile-3.0)
 +   (native-inputs `(("guile" ,guile-3.0/fixed)
+                   ("guile-pfds" ,guile-pfds)
                    ("automake" ,automake)
                    ;; Only used for testing.
                    ("guile-quickcheck" ,guile-quickcheck)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.