Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate Duplicate Server appConfig and Config Structure #391

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

aruokhai
Copy link
Contributor

@aruokhai aruokhai commented Dec 2, 2024

Objective

A duplicate configuration struct in the Server directory complicates coordination. By consolidating it into a single Config structure, the configuration flow becomes more streamlined and efficient.

Scope

Non-critical, as it only affects Config parsing and usage.

closes #390

Copy link
Collaborator

@louisinger louisinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beside FromConfig, LGTM, thanks for the contribution 🙏

cc @altafan

common/bip68.go Outdated Show resolved Hide resolved
@aruokhai aruokhai force-pushed the consolidate-server-conf branch from 3f8b261 to e3809b8 Compare December 5, 2024 10:10
server/internal/config/config.go Outdated Show resolved Hide resolved
server/internal/config/config.go Show resolved Hide resolved
server/internal/config/config.go Show resolved Hide resolved
@tiero
Copy link
Member

tiero commented Dec 12, 2024

Please merge master in your branch, @bordalix should have been addressed already

@aruokhai aruokhai force-pushed the consolidate-server-conf branch from e3809b8 to a922e41 Compare December 13, 2024 09:20
)
}

if c.BoardingExitDelay.Type == common.LocktimeTypeBlock {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, but with BoardingExitDelay

@@ -216,3 +272,343 @@ func getNetwork() (common.Network, error) {
return common.Network{}, fmt.Errorf("unknown network %s", viper.GetString(Network))
}
}

func DetermineLocktimeType(locktime int64) common.Locktime {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
func DetermineLocktimeType(locktime int64) common.Locktime {
func determineLocktimeType(locktime int64) common.Locktime {

no need to be exported, right ? cc @altafan

@aruokhai aruokhai force-pushed the consolidate-server-conf branch 2 times, most recently from 644a654 to 4657e95 Compare December 20, 2024 09:57
@aruokhai aruokhai force-pushed the consolidate-server-conf branch from 4657e95 to cb8b760 Compare January 6, 2025 15:07
server/internal/config/config.go Outdated Show resolved Hide resolved
@altafan
Copy link
Collaborator

altafan commented Jan 15, 2025

@aruokhai can you please sync with master and include the changes we made to config in #417 to yours?

@aruokhai aruokhai force-pushed the consolidate-server-conf branch from a8ef1d1 to 7868f23 Compare January 16, 2025 06:22
@altafan
Copy link
Collaborator

altafan commented Jan 23, 2025

@aruokhai please sync again with master and include the changes made to config/app-config 🙏

@aruokhai aruokhai force-pushed the consolidate-server-conf branch 2 times, most recently from 35dc715 to 2b3aff7 Compare January 29, 2025 07:42
@aruokhai aruokhai force-pushed the consolidate-server-conf branch from 2b3aff7 to c489ede Compare January 31, 2025 12:30
fix, do not export private function

fix

rebased
@aruokhai aruokhai force-pushed the consolidate-server-conf branch from c489ede to fd7339b Compare January 31, 2025 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge app-config and config packages
5 participants