From 48e2fde93a6e963a16139a83d2a04ad6b4a93995 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Sun, 7 Jul 2024 15:06:50 +0200 Subject: [PATCH] get rid of make-message --- core/message.lisp | 8 +------- test/test-core.lisp | 4 ++-- test/test-web.lisp | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/core/message.lisp b/core/message.lisp index 76ac704..294c8ce 100644 --- a/core/message.lisp +++ b/core/message.lisp @@ -2,7 +2,7 @@ (defpackage :scopes/core/message (:use :common-lisp) - (:export #:message #:create #:make-message #:simple-message + (:export #:message #:create #:head #:head-as-list #:data #:sender)) @@ -24,18 +24,12 @@ (timestamp) (data :accessor data :initarg :data :initform nil))) -(defun make-message (head-vals &key data sender) - (create head-vals :data data :sender sender)) - (defun create (head-vals &key data sender) (let ((h (make-instance 'message-head))) (dolist (sl '(domain action class item)) (setf (slot-value h sl) (pop head-vals))) (make-instance 'message :head h :data data :sender sender))) -(defun simple-message (&rest head-vals) - (make-message head-vals)) - (defmethod print-object ((msg message) stream) (with-slots (domain action class item) (head msg) (format stream diff --git a/test/test-core.lisp b/test/test-core.lisp index 99782b7..029af08 100644 --- a/test/test-core.lisp +++ b/test/test-core.lisp @@ -67,8 +67,8 @@ (deftest test-send () (let ((rcvr (receiver t:*test-suite*)) - (msg (message:make-message '(:test :dummy) :data "dummy payload")) - (msg-exp (message:make-message '(:test :dummy) :data "dummy payload"))) + (msg (message:create '(:test :dummy) :data "dummy payload")) + (msg-exp (message:create '(:test :dummy) :data "dummy payload"))) (expect rcvr msg-exp) (== (core:name rcvr) :test-receiver) (core:send rcvr msg) diff --git a/test/test-web.lisp b/test/test-web.lisp index c53e251..0564e97 100644 --- a/test/test-web.lisp +++ b/test/test-web.lisp @@ -36,10 +36,10 @@ (== (parse-integer (server:port (core:config server))) 8899)) (deftest test-fileserver (client) - (let ((msg (message:make-message '(:test :get-page) :data '(:path "demo.html")))) + (let ((msg (message:create '(:test :get-page) :data '(:path "demo.html")))) (== (client:base-url (core:config client)) "http://localhost:8899") (has-prefix (client:get-page client msg) "Hello Fileserver!"))) (deftest test-message (client) - (let ((msg (message:make-message '(:test :data) :data '(:info "test data")))) + (let ((msg (message:create '(:test :data) :data '(:info "test data")))) (== (client:send-message client msg) "test data")))