From cf5304491803ca749730bdaca38252b37c30d8ce Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 11 Jan 2022 15:33:19 -0500
Subject: [PATCH] Tahoe passes us the unwrapped backend already!
This suggests an integration test would be useful.
---
src/_zkapauthorizer/_plugin.py | 3 +--
src/_zkapauthorizer/tests/foolscap.py | 9 +--------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/_zkapauthorizer/_plugin.py b/src/_zkapauthorizer/_plugin.py
index 1f96295..95a45a4 100644
--- a/src/_zkapauthorizer/_plugin.py
+++ b/src/_zkapauthorizer/_plugin.py
@@ -140,8 +140,7 @@ class ZKAPAuthorizer(object):
registry=registry,
)
storage_server = ZKAPAuthorizerStorageServer(
- # unwrap the Foolscap layer, we'll do it ourselves.
- anonymous_storage_server._server,
+ anonymous_storage_server,
pass_value=pass_value,
signing_key=signing_key,
spender=spender,
diff --git a/src/_zkapauthorizer/tests/foolscap.py b/src/_zkapauthorizer/tests/foolscap.py
index 9512f47..25cfcf7 100644
--- a/src/_zkapauthorizer/tests/foolscap.py
+++ b/src/_zkapauthorizer/tests/foolscap.py
@@ -17,7 +17,6 @@ Testing helpers related to Foolscap.
"""
import attr
-from allmydata.interfaces import RIStorageServer
from foolscap.api import Any, Copyable, Referenceable, RemoteInterface
from foolscap.copyable import CopyableSlicer, ICopyable
from twisted.internet.defer import fail, succeed
@@ -38,14 +37,8 @@ class StubStorageBackend(object):
pass
-@implementer(RIStorageServer)
-@attr.s
-class StubFoolscapStorageServer(object):
- _server = attr.ib(default=attr.Factory(StubStorageBackend))
-
-
def get_anonymous_storage_server():
- return StubFoolscapStorageServer()
+ return StubStorageBackend()
class BrokenCopyable(Copyable):
--
GitLab