From ba50146c035cedf105af50d33cb48208286a99c2 Mon Sep 17 00:00:00 2001 From: zhouop0 <11733741+zhouop0@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:19:52 +0800 Subject: [PATCH] format --- x/bitcoincommiter/keeper/config.go | 7 +++++-- x/bitcoincommiter/keeper/connfig_test.go | 2 +- x/bitcoincommiter/keeper/keeper.go | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/x/bitcoincommiter/keeper/config.go b/x/bitcoincommiter/keeper/config.go index 83c9470b36..d6aafdfaa4 100644 --- a/x/bitcoincommiter/keeper/config.go +++ b/x/bitcoincommiter/keeper/config.go @@ -23,12 +23,15 @@ const ( BitcoinRPCConfigFileName = "bitcoin.yaml" ) -func DefaultBITCOINConfig(homePath string) (*BITCOINConfig, error) { +func DefaultBITCOINConfig(homePath string) *BITCOINConfig { data, err := os.ReadFile(homePath + "/" + BitcoinRPCConfigFileName) if err != nil { log.Fatalf("can not read rpc config file: %v", err) } config := BITCOINConfig{} err = yaml.Unmarshal(data, &config) - return &config, err + if err != nil { + log.Fatalf("can not unmarshal rpc config file: %v", err) + } + return &config } diff --git a/x/bitcoincommiter/keeper/connfig_test.go b/x/bitcoincommiter/keeper/connfig_test.go index 5a3687e796..c16a9f5171 100644 --- a/x/bitcoincommiter/keeper/connfig_test.go +++ b/x/bitcoincommiter/keeper/connfig_test.go @@ -8,7 +8,7 @@ import ( ) func TestConfig(t *testing.T) { - config, _ := keeper.DefaultBITCOINConfig("../test/source") + config := keeper.DefaultBITCOINConfig("../test/source") require.Equal(t, "signet", config.NetworkName) require.Equal(t, "localhost", config.RPCHost) require.Equal(t, "8332", config.RPCPort) diff --git a/x/bitcoincommiter/keeper/keeper.go b/x/bitcoincommiter/keeper/keeper.go index b262f4e243..1cd4283b66 100644 --- a/x/bitcoincommiter/keeper/keeper.go +++ b/x/bitcoincommiter/keeper/keeper.go @@ -26,12 +26,11 @@ func NewKeeper( ps paramtypes.Subspace, homePath string, ) *Keeper { - bitcoinConfig, _ := DefaultBITCOINConfig(homePath) return &Keeper{ cdc: cdc, memKey: memKey, paramstore: ps, - config: bitcoinConfig, + config: DefaultBITCOINConfig(homePath), } }