From 96a2138bfb54272684d7945ae4d3cb0f105baa6c Mon Sep 17 00:00:00 2001 From: zhouop0 <11733741+zhouop0@users.noreply.github.com> Date: Fri, 17 Nov 2023 17:15:01 +0800 Subject: [PATCH] format --- bitcoin/config_test.go | 12 ++++++------ server/config/config.go | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bitcoin/config_test.go b/bitcoin/config_test.go index 98aaf9f373..c7c867a9dc 100644 --- a/bitcoin/config_test.go +++ b/bitcoin/config_test.go @@ -13,16 +13,16 @@ func TestSetBitcoinConfig(t *testing.T) { // Create a new BitcoinConfig instance. config := config.BITCOINConfig{ NetworkName: "mainnet", - RpcHost: "username", - RpcUser: "password", - RpcPass: "localhost", + RPCHost: "username", + RPCUser: "password", + RPCPass: "localhost", WalletName: "ss", } // Call the SetBitcoinConfig function. rpcConfig := SetBitcoinConfig(config) require.Equal(t, rpcConfig.Params, chaincfg.MainNetParams) - require.Equal(t, rpcConfig.ConnConfig.Host, config.RpcHost) - require.Equal(t, rpcConfig.ConnConfig.User, config.RpcUser) - require.Equal(t, rpcConfig.ConnConfig.Pass, config.RpcPass) + require.Equal(t, rpcConfig.ConnConfig.Host, config.RPCHost) + require.Equal(t, rpcConfig.ConnConfig.User, config.RPCUser) + require.Equal(t, rpcConfig.ConnConfig.Pass, config.RPCPass) } diff --git a/server/config/config.go b/server/config/config.go index 13ef1145f4..62695f7559 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -434,13 +434,13 @@ func (c BITCOINConfig) Validate() error { if c.NetworkName != "" && !strings.StringInSlice(c.NetworkName, bitcoinNetworkNames) { return fmt.Errorf("invalid network name %s, available names: %v", c.NetworkName, bitcoinNetworkNames) } - if c.RPCHost != "" { + if c.RPCHost == "" { return fmt.Errorf("rpc host is not allowed empty") } - if c.RPCPass != "" { + if c.RPCPass == "" { return fmt.Errorf("rpc pass is not allowed empty") } - if c.WalletName != "" { + if c.WalletName == "" { return fmt.Errorf("rpc wallet name is not allowed empty") } return nil