Merge branch 'no-allocate-buffers'

4 files changed, 15 insertions, 7 deletions

diff --git a/tests/backend-tests.lisp b/tests/backend-tests.lisp
index 625740f..dc411d5 100644
--- a/tests/backend-tests.lisp
+++ b/tests/backend-tests.lisp
@@ -21,7 +21,7 @@
   `(let ((backend (make-instance 'hash-backend))
          (array ,array))
      (is (equalp (alexandria:read-stream-content-into-byte-vector
-                  (fetch-read-capability
+                  (fetch-data
                    (store-data array backend :block-size ,block-size :secret ,secret) backend))
                  array))))
 
@@ -49,7 +49,7 @@
           (let* ((backend (make-instance 'file-backend :directory tmpdir))
                  (array ,array))
             (is (equalp (alexandria:read-stream-content-into-byte-vector
-                         (fetch-read-capability
+                         (fetch-data
                           (store-data array backend :secret ,secret) backend))
                         array)))
        (uiop:delete-directory-tree tmpdir :validate t))))
diff --git a/tests/decode-tests.lisp b/tests/decode-tests.lisp
index 27ff4e3..5053d11 100644
--- a/tests/decode-tests.lisp
+++ b/tests/decode-tests.lisp
@@ -22,7 +22,8 @@
 (defvar *stream* nil)
 
 (defun hashtable-encode (block ref)
-  (setf (gethash ref *table*) block))
+  (setf (gethash ref *table*) (copy-seq block))
+  block)
 
 (defun hashtable-decode (ref)
   (copy-seq (gethash ref *table*)))
diff --git a/tests/encode-tests.lisp b/tests/encode-tests.lisp
index 214eaad..abbeb0d 100644
--- a/tests/encode-tests.lisp
+++ b/tests/encode-tests.lisp
@@ -21,13 +21,13 @@
          (vector-encode (read-capability-to-urn
                          (eris-encode ,data
                                       ,block-size
-                                      (lambda (&rest args) (declare (ignore args)))
+                                      (lambda (block ref) (declare (ignore ref)) block)
                                       :secret ,secret)))
          (stream-encode (read-capability-to-urn
                          (with-octet-input-stream (stream ,data)
                            (eris-encode stream
                                         ,block-size
-                                        (lambda (&rest args) (declare (ignore args)))
+                                        (lambda (block ref) (declare (ignore ref)) block)
                                         :secret ,secret)))))
      (is (equalp vector-encode urn))
      (is (equalp stream-encode urn))))
@@ -36,6 +36,12 @@
   (check-urn (base32-to-bytes-unpadded "JBSWY3DPEB3W64TMMQQQ") 1024
              "urn:eris:BIAD77QDJMFAKZYH2DXBUZYAP3MXZ3DJZVFYQ5DFWC6T65WSFCU5S2IT4YZGJ7AC4SYQMP2DM2ANS2ZTCP3DJJIRV733CRAAHOSWIYZM3M"))
 
+(test empty-stream
+  (check-urn (serapeum:make-octet-vector 0) 1024
+             "urn:eris:BIADFUKDPYKJNLGCVSIIDI3FVKND7MO5AGOCXBK2C4ITT5MAL4LSCZF62B4PDOFQCLLNL7AXXSJFGINUYXVGVTDCQ2V7S7W5S234WFXCJ4")
+  (check-urn (serapeum:make-octet-vector 0) eris:32kib
+             "urn:eris:B4AC3MKL2BYR3E2WPMY2QRA6QZBLY4VNWJEBTSK5KWD66BRIT2EXVQVWY6TWVKJCZLC66RE3T2PKWDU3TBAKZZZIZRBTMP6BSOPE4CRXII"))
+
 ;; simple gray stream class for this particular construction.
 (defclass null-stream (fundamental-binary-input-stream)
   ((counter :initform 0 :accessor counter)
@@ -60,7 +66,7 @@
                                                   ,key)
                                                  :initialization-vector (make-array 8 :element-type '(unsigned-byte 8) :initial-element 0)
                                                  :direction :input)))
-     (let ((read-capability (eris-encode chacha-stream ,block-size (lambda (&rest args) (declare (ignore args))))))
+     (let ((read-capability (eris-encode chacha-stream ,block-size (lambda (block ref) (declare (ignore ref)) block))))
        (is (equalp (read-capability-to-urn read-capability)
                    ,urn)))))
 
diff --git a/tests/rfc.lisp b/tests/rfc.lisp
index 15b993e..dafa086 100644
--- a/tests/rfc.lisp
+++ b/tests/rfc.lisp
@@ -24,7 +24,8 @@
 
 (defun test-output (block ref)
   (assert (equalp block
-                  (base32-to-bytes-unpadded (getf *alist* (intern (bytes-to-base32-unpadded ref) :keyword))))))
+                  (base32-to-bytes-unpadded (getf *alist* (intern (bytes-to-base32-unpadded ref) :keyword)))))
+  block)
 
 (defmacro positive-test (urn content block-alist secret block-size)
   `(let ((*alist* ,block-alist)