From ae178f003f6a313cd19136685ee2378a8aebb566 Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Sun, 10 Mar 2024 13:06:33 -0400
Subject: [PATCH] refactor: put sia config under storage

---
 config/core.go          |  1 -
 config/storage.go       |  3 ++-
 renter/price_tracker.go | 12 ++++++------
 renter/renter.go        |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/core.go b/config/core.go
index f405f65..e3208bc 100644
--- a/config/core.go
+++ b/config/core.go
@@ -18,7 +18,6 @@ type CoreConfig struct {
 	Log             LogConfig      `mapstructure:"log"`
 	Port            uint           `mapstructure:"port"`
 	PostUploadLimit uint64         `mapstructure:"post_upload_limit"`
-	Sia             SiaConfig      `mapstructure:"sia"`
 	Storage         StorageConfig  `mapstructure:"storage"`
 	Protocols       []string       `mapstructure:"protocols"`
 	Mail            MailConfig     `mapstructure:"mail"`
diff --git a/config/storage.go b/config/storage.go
index b8ca374..cbbd4b7 100644
--- a/config/storage.go
+++ b/config/storage.go
@@ -1,5 +1,6 @@
 package config
 
 type StorageConfig struct {
-	S3 S3Config `mapstructure:"s3"`
+	S3  S3Config  `mapstructure:"s3"`
+	Sia SiaConfig `mapstructure:"sia"`
 }
diff --git a/renter/price_tracker.go b/renter/price_tracker.go
index 1919aff..804d61f 100644
--- a/renter/price_tracker.go
+++ b/renter/price_tracker.go
@@ -102,27 +102,27 @@ SELECT AVG(rate) as average_rate FROM (
 		return err
 	}
 
-	gouge.MaxDownloadPrice, err = siacoinsFromFloat(p.config.Config().Core.Sia.MaxDownloadPrice / averageRate)
+	gouge.MaxDownloadPrice, err = siacoinsFromFloat(p.config.Config().Core.Storage.Sia.MaxDownloadPrice / averageRate)
 	if err != nil {
 		return err
 	}
 
-	gouge.MaxUploadPrice, err = siacoinsFromFloat(p.config.Config().Core.Sia.MaxUploadPrice / averageRate)
+	gouge.MaxUploadPrice, err = siacoinsFromFloat(p.config.Config().Core.Storage.Sia.MaxUploadPrice / averageRate)
 	if err != nil {
 		return err
 	}
 
-	gouge.MaxContractPrice, err = siacoinsFromFloat(p.config.Config().Core.Sia.MaxContractPrice / averageRate)
+	gouge.MaxContractPrice, err = siacoinsFromFloat(p.config.Config().Core.Storage.Sia.MaxContractPrice / averageRate)
 	if err != nil {
 		return err
 	}
 
-	gouge.MaxStoragePrice, err = siacoinsFromFloat(p.config.Config().Core.Sia.MaxStoragePrice / averageRate)
+	gouge.MaxStoragePrice, err = siacoinsFromFloat(p.config.Config().Core.Storage.Sia.MaxStoragePrice / averageRate)
 	if err != nil {
 		return err
 	}
 
-	gouge.MaxRPCPrice, err = siacoinsFromFloat(p.config.Config().Core.Sia.MaxRPCPrice / averageRate)
+	gouge.MaxRPCPrice, err = siacoinsFromFloat(p.config.Config().Core.Storage.Sia.MaxRPCPrice / averageRate)
 	if err != nil {
 		return err
 	}
@@ -145,7 +145,7 @@ func (p PriceTracker) importPrices() error {
 		return err
 	}
 
-	daysOfHistory := p.config.Config().Core.Sia.PriceHistoryDays
+	daysOfHistory := p.config.Config().Core.Storage.Sia.PriceHistoryDays
 
 	// Check if the count is less than x
 	if uint64(count) < daysOfHistory {
diff --git a/renter/renter.go b/renter/renter.go
index c67c10f..13f187b 100644
--- a/renter/renter.go
+++ b/renter/renter.go
@@ -111,8 +111,8 @@ func (r *RenterDefault) UploadObject(ctx context.Context, file io.Reader, bucket
 }
 
 func (r *RenterDefault) init() error {
-	addr := r.config.Config().Core.Sia.URL
-	passwd := r.config.Config().Core.Sia.Key
+	addr := r.config.Config().Core.Storage.Sia.URL
+	passwd := r.config.Config().Core.Storage.Sia.Key
 
 	addrURL, err := url.Parse(addr)