[go: nahoru, domu]
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.

Sign up for GitHub

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

Jump to bottom

feature: Implement --save option in 'ipfs swarm peering add/rm' #9425

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

feature: Implement --save option in 'ipfs swarm peering add/rm' #9425

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c9f85f
Implement --save option in ipfs swarm peering add/rm
samuelbacaner Aug 14, 2022
e3369a4
Factor our config update; simplify updating config in add case
samuelbacaner Aug 25, 2022
cc967e9
Fix error message
ajnavarro Nov 21, 2022
35efa59
Requested changes.
ajnavarro Dec 6, 2022
689f476
Improve delete from config code
ajnavarro Dec 6, 2022
70524a0
Merge branch 'master' into ajnavarro/swarm-peering-save
ajnavarro Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Factor our config update; simplify updating config in add case
  • Loading branch information
@samuelbacaner @ajnavarro
samuelbacaner authored and ajnavarro committed Dec 6, 2022
commit e3369a489db686168f4176f301ee22051db226b2
60 changes: 22 additions & 38 deletions core/commands/swarm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,24 +142,12 @@ var swarmPeeringAddCmd = &cmds.Command{

save, _ := req.Options[swarmSaveOptionName].(bool)
if save {
r, err := fsrepo.Open(env.(*commands.Context).ConfigRoot)
if err != nil {
return err
}
defer r.Close()
cfg, err := r.Config()
if err != nil {
return err
update := func(cfg *config.Config) {
cfg.Peering.Peers = node.Peering.ListPeers()
ajnavarro marked this conversation as resolved.
Show resolved Hide resolved
}

addrInfos, err := mergeAddrInfo(addInfos, cfg.Peering.Peers)
err := updateAndPersistConfig(env, update)
if err != nil {
return fmt.Errorf("error merging peers: %w", err)
}

cfg.Peering.Peers = addrInfos
if err := r.SetConfig(cfg); err != nil {
return fmt.Errorf("error writing new peers to repo config: %w", err)
return fmt.Errorf("unable to update and persist config change: %w", err)
}
}

Expand Down Expand Up @@ -247,19 +235,12 @@ var swarmPeeringRmCmd = &cmds.Command{

save, _ := req.Options[swarmSaveOptionName].(bool)
if save {
r, err := fsrepo.Open(env.(*commands.Context).ConfigRoot)
if err != nil {
return err
update := func(cfg *config.Config) {
cfg.Peering.Peers = node.Peering.ListPeers()
ajnavarro marked this conversation as resolved.
Show resolved Hide resolved
}
defer r.Close()
cfg, err := r.Config()
err := updateAndPersistConfig(env, update)
if err != nil {
return err
}

cfg.Peering.Peers = node.Peering.ListPeers()
if err := r.SetConfig(cfg); err != nil {
return fmt.Errorf("error removing peers from repo config: %w", err)
return fmt.Errorf("unable to update and persist config change: %w", err)
}
}

Expand Down Expand Up @@ -1141,16 +1122,19 @@ func filtersRemove(r repo.Repo, cfg *config.Config, toRemoveFilters []string) ([
return removed, nil
}

func mergeAddrInfo(addrInfos ...[]peer.AddrInfo) ([]peer.AddrInfo, error) {
var addrs []ma.Multiaddr
for _, infos := range addrInfos {
for _, addrInfo := range infos {
addr, err := peer.AddrInfoToP2pAddrs(&addrInfo)
if err != nil {
return nil, err
}
addrs = append(addrs, addr...)
}
func updateAndPersistConfig(env cmds.Environment, update func(*config.Config)) error {
r, err := fsrepo.Open(env.(*commands.Context).ConfigRoot)
if err != nil {
return fmt.Errorf("error opening repo: %w", err)
}
defer r.Close()
cfg, err := r.Config()
if err != nil {
return fmt.Errorf("error fetching config file: %w", err)
}
update(cfg)
if err := r.SetConfig(cfg); err != nil {
return fmt.Errorf("error removing peers from repo config: %w", err)
}
return peer.AddrInfosFromP2pAddrs(addrs...)
return nil
}