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

feat(cmd/rpc): add commands for the p2p module #2599

Merged
merged 12 commits into from
Sep 4, 2023
Merged

feat(cmd/rpc): add commands for the p2p module #2599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bc87a7b
feat(cmd/rpc): add commands for p2p module
vgonkivs Aug 22, 2023
389fa41
change permission for peers
vgonkivs Aug 31, 2023
b1ebd18
apply suggestions
vgonkivs Aug 31, 2023
a0e21a9
apply suggestions
vgonkivs Aug 31, 2023
6c4b334
fix permissions
vgonkivs Aug 31, 2023
88e8e70
rework printOutput
vgonkivs Aug 31, 2023
0dbf95a
update formatter in blob cmd
vgonkivs Aug 31, 2023
07f4296
add switch
vgonkivs Aug 31, 2023
31ee741
rework switch
vgonkivs Aug 31, 2023
6991d2d
rework error handling in printOutput
vgonkivs Sep 4, 2023
50b344d
fix ooops
vgonkivs Sep 4, 2023
8b99972
Merge branch 'rpc_cmds_feature_branch' into rpc_partTwo_the_p2pModule…
vgonkivs Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 9 additions & 24 deletions cmd/celestia/p2p.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@ var infoCmd = &cobra.Command{
info, err := client.P2P.Info(cmd.Context())

formatter := func(data interface{}) interface{} {
peerAdd, ok := data.(peer.AddrInfo)
if !ok {
return peerAdd
}

peerAdd := data.(peer.AddrInfo)
ma := make([]string, len(info.Addrs))
for i := range peerAdd.Addrs {
ma[i] = peerAdd.Addrs[i].String()
Expand Down Expand Up @@ -92,10 +88,7 @@ var peersCmd = &cobra.Command{
}

formatter := func(data interface{}) interface{} {
conPeers, ok := data.([]string)
if !ok {
return conPeers
}
conPeers := data.([]string)
return struct {
Peers []string `json:"peers"`
}{
Expand Down Expand Up @@ -124,11 +117,7 @@ var peerInfoCmd = &cobra.Command{
}
info, err := client.P2P.PeerInfo(cmd.Context(), pid)
formatter := func(data interface{}) interface{} {
peerAdd, ok := data.(peer.AddrInfo)
if !ok {
return peerAdd
}

peerAdd := data.(peer.AddrInfo)
ma := make([]string, len(info.Addrs))
for i := range peerAdd.Addrs {
ma[i] = peerAdd.Addrs[i].String()
Expand Down Expand Up @@ -294,7 +283,7 @@ var blockPeerCmd = &cobra.Command{
}
}

printOutput(nil, err, formatter)
printOutput(err, nil, formatter)
return nil
},
}
Expand Down Expand Up @@ -334,7 +323,7 @@ var unblockPeerCmd = &cobra.Command{
}
}

printOutput(nil, err, formatter)
printOutput(err, nil, formatter)
return nil
},
}
Expand Down Expand Up @@ -404,7 +393,7 @@ var protectCmd = &cobra.Command{
}
}

printOutput(nil, err, formatter)
printOutput(err, nil, formatter)
return nil
},
}
Expand All @@ -425,7 +414,7 @@ var unprotectCmd = &cobra.Command{
return err
}

result, err := client.P2P.Unprotect(cmd.Context(), pid, args[1])
_, err = client.P2P.Unprotect(cmd.Context(), pid, args[1])

formatter := func(data interface{}) interface{} {
err, ok := data.(error)
Expand All @@ -444,7 +433,7 @@ var unprotectCmd = &cobra.Command{
}
}

printOutput(result, err, formatter)
printOutput(err, nil, formatter)
return nil
},
}
Expand Down Expand Up @@ -575,7 +564,6 @@ var pubsubPeersCmd = &cobra.Command{
return err
}

//TODO: check
result, err := client.P2P.PubSubPeers(cmd.Context(), args[0])
peers := make([]string, len(result))

Expand All @@ -584,10 +572,7 @@ var pubsubPeersCmd = &cobra.Command{
}

formatter := func(data interface{}) interface{} {
conPeers, ok := data.([]string)
if !ok {
return data
}
conPeers := data.([]string)
return struct {
Peers []string `json:"peers"`
}{
Expand Down
8 changes: 4 additions & 4 deletions cmd/celestia/rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,10 +404,10 @@ func rpcClient(ctx context.Context) (*client.Client, error) {
func printOutput(data interface{}, err error, formatData func(interface{}) interface{}) {
if err != nil {
data = err
}

if formatData != nil {
data = formatData(data)
} else {
vgonkivs marked this conversation as resolved.
Show resolved Hide resolved
if formatData != nil {
data = formatData(data)
}
}

resp := struct {
Expand Down