format

b2network · Nov 21, 2023 · c4db3b1 · c4db3b1
1 parent 7b30af0
commit c4db3b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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),
 	}
 }