From f3fc4268309316e9200f251df64b27a7bca5f33e Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@pythonspeed.com>
Date: Tue, 15 Nov 2022 14:36:14 -0500
Subject: [PATCH] Switch to [storage] force_foolscap.

---
 src/allmydata/client.py             | 1 +
 src/allmydata/node.py               | 3 +--
 src/allmydata/test/common_system.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 1e28bb98b..1a158a1aa 100644
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -104,6 +104,7 @@ _client_config = configutil.ValidConfiguration(
             "reserved_space",
             "storage_dir",
             "plugins",
+            "force_foolscap",
         ),
         "sftpd": (
             "accounts.file",
diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index f572cf7d9..8266fe3fb 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -64,7 +64,6 @@ def _common_valid_config():
             "tcp",
         ),
         "node": (
-            "force_foolscap",
             "log_gatherer.furl",
             "nickname",
             "reveal-ip-address",
@@ -916,7 +915,7 @@ def create_main_tub(config, tub_options,
         # don't want to enable HTTP by default.
         # https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3934
         force_foolscap=config.get_config(
-            "node", "force_foolscap", default=True, boolean=True
+            "storage", "force_foolscap", default=True, boolean=True
         ),
         handler_overrides=handler_overrides,
         certFile=certfile,
diff --git a/src/allmydata/test/common_system.py b/src/allmydata/test/common_system.py
index 0c7d7f747..d49e7831d 100644
--- a/src/allmydata/test/common_system.py
+++ b/src/allmydata/test/common_system.py
@@ -814,7 +814,7 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
         sethelper = partial(setconf, config, which, "helper")
 
         setnode("nickname", u"client %d \N{BLACK SMILING FACE}" % (which,))
-        setnode("force_foolscap", str(force_foolscap))
+        setconf(config, which, "storage", "force_foolscap", str(force_foolscap))
 
         tub_location_hint, tub_port_endpoint = self.port_assigner.assign(reactor)
         setnode("tub.port", tub_port_endpoint)