From 9d610991be3b7b1d2f5292a80d76ad78645ac441 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Wed, 26 Aug 2020 21:15:36 +0200
Subject: [PATCH] bitcoind: remove custom rpc user names

Simpler.
We've just removed option 'bitcoind.rpcuser', so we can also remove the
old name 'bitcoinrpc'.
---
 modules/bitcoind.nix | 2 --
 test/base.py         | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix
index c7bcd14..5862190 100644
--- a/modules/bitcoind.nix
+++ b/modules/bitcoind.nix
@@ -290,11 +290,9 @@ in {
       })
       {
         rpc.users.privileged = {
-          name = "bitcoinrpc";
           passwordHMACFromFile = true;
         };
         rpc.users.public = {
-          name = "publicrpc";
           passwordHMACFromFile = true;
           rpcwhitelist = import ./bitcoind-rpc-public-whitelist.nix;
         };
diff --git a/test/base.py b/test/base.py
index 7df7108..c35d380 100644
--- a/test/base.py
+++ b/test/base.py
@@ -50,10 +50,10 @@ def run_tests(extra_tests):
     machine.wait_until_succeeds("su operator -c 'bitcoin-cli help'")
     # Restating rpcuser & rpcpassword overrides privileged credentials
     machine.fail(
-        "bitcoin-cli -rpcuser=publicrpc -rpcpassword=$(cat /secrets/bitcoin-rpcpassword-public) help"
+        "bitcoin-cli -rpcuser=public -rpcpassword=$(cat /secrets/bitcoin-rpcpassword-public) help"
     )
     machine.wait_until_succeeds(
-        log_has_string("bitcoind", "RPC User publicrpc not allowed to call method help")
+        log_has_string("bitcoind", "RPC User public not allowed to call method help")
     )
 
     assert_running("electrs")