From 493ad2349cbf1fb3a8ef217f160d42cb87a59ea3 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Thu, 6 Jul 2023 20:05:42 -0700 Subject: [PATCH] Rename host/client to initiator/joiner --- Makefile.am | 4 +-- configure.ac | 4 +-- gib-gab-gob/rps.scm | 32 ++++++++++----------- guix.scm | 2 +- hall.scm | 8 +++--- scripts/{make-host.in => make-initiator.in} | 2 +- scripts/{make-client.in => make-joiner.in} | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) rename scripts/{make-host.in => make-initiator.in} (79%) rename scripts/{make-client.in => make-joiner.in} (67%) diff --git a/Makefile.am b/Makefile.am index 28f5181..7f0104f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -bin_SCRIPTS = scripts/make-client \ - scripts/make-host +bin_SCRIPTS = scripts/make-joiner \ + scripts/make-initiator # Handle substitution of fully-expanded Autoconf variables. do_subst = $(SED) \ diff --git a/configure.ac b/configure.ac index 22fb5b0..231eeff 100644 --- a/configure.ac +++ b/configure.ac @@ -12,8 +12,8 @@ AM_SILENT_RULES([yes]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env]) -AC_CONFIG_FILES([scripts/make-client],[chmod +x scripts/make-client]) -AC_CONFIG_FILES([scripts/make-host],[chmod +x scripts/make-host]) +AC_CONFIG_FILES([scripts/make-joiner],[chmod +x scripts/make-joiner]) +AC_CONFIG_FILES([scripts/make-initiator],[chmod +x scripts/make-initiator]) dnl Search for 'guile' and 'guild'. This macro defines dnl 'GUILE_EFFECTIVE_VERSION'. GUILE_PKG([3.0 2.2 2.0]) diff --git a/gib-gab-gob/rps.scm b/gib-gab-gob/rps.scm index 439dfb5..996ea8e 100644 --- a/gib-gab-gob/rps.scm +++ b/gib-gab-gob/rps.scm @@ -6,7 +6,7 @@ #:use-module (goblins ocapn captp) #:use-module (goblins ocapn ids) #:use-module (goblins ocapn netlayer testuds) - #:export (make-host make-client)) + #:export (make-initiator make-joiner)) ;; ;; Helper to use testuds netlayer @@ -17,16 +17,16 @@ (spawn ^testuds-netlayer tmp)) ;; -;; Host logic +;; Initiator logic ;; -(define (make-host ^game-controller) +(define (make-initiator ^game-controller) (with-vat (spawn-vat) - (define lobby (spawn ^game-lobby ^game-controller)) + (define initiator (spawn ^game-initiator ^game-controller)) (define mycapn (spawn-mycapn (new-testuds-netlayer))) - (define lobby-sref ($ mycapn 'register lobby 'testuds)) - (format #t "Connect to: ~a\n" (ocapn-id->string lobby-sref)))) + (define init-sref ($ mycapn 'register initiator 'testuds)) + (format #t "Connect to: ~a\n" (ocapn-id->string init-sref)))) -(define (^game-lobby bcom ^game-controller) +(define (^game-initiator bcom ^game-controller) (define pick (pick-rps)) (methods @@ -39,21 +39,21 @@ (bcom (^game-controller bcom won? peer))))])) ;; -;; Client logic +;; Joiner logic ;; -(define (make-client ^game-controller user-name addr) +(define (make-joiner ^game-controller user-name addr) (pk user-name) (pk addr) (pk ^game-controller) (with-vat (spawn-vat) (define mycapn (spawn-mycapn (new-testuds-netlayer))) - (define lobby-sref (string->ocapn-id addr)) - (define lobby ($ mycapn 'enliven lobby-sref)) - (define client-picker (spawn ^client-picker lobby ^game-controller)) - (on (<- lobby 'register-opponent user-name client-picker ($ client-picker 'get-sealed-pick)) + (define init-sref (string->ocapn-id addr)) + (define initiator ($ mycapn 'enliven init-sref)) + (define joiner (spawn ^game-joiner initiator ^game-controller)) + (on (<- initiator 'register-opponent user-name joiner ($ joiner 'get-sealed-pick)) (λ (_) (format #t "~a finished the game.\n" user-name))))) -(define (^client-picker bcom lobby ^game-controller) +(define (^game-joiner bcom initiator ^game-controller) (define-values (seal-pick unseal-pick my-pick?) (spawn-sealer-triplet)) (define pick (pick-rps)) @@ -62,10 +62,10 @@ [(pick->unsealer peer-pick) (define won? (rps-winner pick peer-pick)) (format #t "Peer picked ~a... a bold choice (do I win? ~a), I will become a controller and send my unsealer.\n" peer-pick won?) - ;; We make the assumption that lobby is to become a controller. + ;; We make the assumption that initiator is to become a controller. ;; Note second arg to bcom which will return the value (this is confusing to me) ;; see https://spritely.institute/files/docs/guile-goblins/0.11.0/Object-construction.html - (bcom (^game-controller bcom won? lobby) unseal-pick)])) + (bcom (^game-controller bcom won? initiator) unseal-pick)])) ;; ;; Standard rock paper scissors logic follows! diff --git a/guix.scm b/guix.scm index 23ef3cb..ec71fe9 100644 --- a/guix.scm +++ b/guix.scm @@ -69,7 +69,7 @@ "GUILE_LOAD_COMPILED_PATH" (compiled-dir out version) (compiled-dir "" version)))) - ,''("make-client" "make-host")) + ,''("make-joiner" "make-initiator")) #t)))))))) (native-inputs `(("autoconf" ,autoconf) diff --git a/hall.scm b/hall.scm index 5a24f3c..b0f99b2 100644 --- a/hall.scm +++ b/hall.scm @@ -26,10 +26,10 @@ (programs ((directory "scripts" - ((in-file "make-client") - (in-file "make-host") - (text-file "make-host") - (text-file "make-client"))))) + ((in-file "make-joiner") + (in-file "make-initiator") + (text-file "make-initiator") + (text-file "make-joiner"))))) (documentation ((org-file "README"))) (infrastructure ((in-file "pre-inst-env") diff --git a/scripts/make-host.in b/scripts/make-initiator.in similarity index 79% rename from scripts/make-host.in rename to scripts/make-initiator.in index c5002e7..b457f40 100644 --- a/scripts/make-host.in +++ b/scripts/make-initiator.in @@ -5,6 +5,6 @@ (use-modules (gib-gab-gob rps) (gib-gab-gob game)) -(make-host ^ggg-controller) +(make-initiator ^ggg-controller) (while #t #f) ;; indefinitely diff --git a/scripts/make-client.in b/scripts/make-joiner.in similarity index 67% rename from scripts/make-client.in rename to scripts/make-joiner.in index b51cbfc..e86347b 100644 --- a/scripts/make-client.in +++ b/scripts/make-joiner.in @@ -5,6 +5,6 @@ (use-modules (gib-gab-gob rps) (gib-gab-gob game)) -(apply make-client (cons ^ggg-controller (cdr (command-line)))) +(apply make-joiner (cons ^ggg-controller (cdr (command-line)))) (while #t #f) ;; indefinitely