From fdb3c4462417dd1caeb28d263c1f3be6e453f6bb Mon Sep 17 00:00:00 2001 From: Shulhan Date: Sun, 22 May 2022 21:56:02 +0700 Subject: all: use the exported Blockd type instead of interface{} Since we have exported the Blockd type from rescached package, any Blockd operation on the HTTP server and on the client on cmd/resolver can use it instead of using interface{}. --- client.go | 21 +++++++++------------ cmd/resolver/resolver.go | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/client.go b/client.go index 480fe53..18a5f7b 100644 --- a/client.go +++ b/client.go @@ -61,13 +61,12 @@ func (cl *Client) Blockd() (hostBlockd map[string]*Blockd, err error) { } // BlockdDisable disable specific hosts on block.d. -func (cl *Client) BlockdDisable(blockdName string) (an interface{}, err error) { +func (cl *Client) BlockdDisable(blockdName string) (blockd *Blockd, err error) { var ( logp = "BlockdDisable" res = libhttp.EndpointResponse{} params = url.Values{} - hb *Blockd resb []byte ) @@ -78,7 +77,7 @@ func (cl *Client) BlockdDisable(blockdName string) (an interface{}, err error) { return nil, fmt.Errorf("%s: %w", logp, err) } - res.Data = &hb + res.Data = &blockd err = json.Unmarshal(resb, &res) if err != nil { return nil, fmt.Errorf("%s: %w", logp, err) @@ -87,17 +86,16 @@ func (cl *Client) BlockdDisable(blockdName string) (an interface{}, err error) { return nil, fmt.Errorf("%s: %d %s", logp, res.Code, res.Message) } - return hb, nil + return blockd, nil } // BlockdEnable enable specific hosts on block.d. -func (cl *Client) BlockdEnable(blockdName string) (an interface{}, err error) { +func (cl *Client) BlockdEnable(blockdName string) (blockd *Blockd, err error) { var ( logp = "BlockdEnable" res = libhttp.EndpointResponse{} params = url.Values{} - hb *Blockd resb []byte ) @@ -108,7 +106,7 @@ func (cl *Client) BlockdEnable(blockdName string) (an interface{}, err error) { return nil, fmt.Errorf("%s: %w", logp, err) } - res.Data = &hb + res.Data = &blockd err = json.Unmarshal(resb, &res) if err != nil { return nil, fmt.Errorf("%s: %w", logp, err) @@ -117,18 +115,17 @@ func (cl *Client) BlockdEnable(blockdName string) (an interface{}, err error) { return nil, fmt.Errorf("%s: %d %s", logp, res.Code, res.Message) } - return hb, nil + return blockd, nil } // BlockdUpdate fetch the latest hosts file from the hosts block // provider based on registered URL. -func (cl *Client) BlockdUpdate(blockdName string) (an interface{}, err error) { +func (cl *Client) BlockdUpdate(blockdName string) (blockd *Blockd, err error) { var ( logp = "BlockdUpdate" params = url.Values{} res = libhttp.EndpointResponse{} - hb *Blockd resb []byte ) @@ -139,7 +136,7 @@ func (cl *Client) BlockdUpdate(blockdName string) (an interface{}, err error) { return nil, fmt.Errorf("%s: %w", logp, err) } - res.Data = &hb + res.Data = &blockd err = json.Unmarshal(resb, &res) if err != nil { return nil, fmt.Errorf("%s: %w", logp, err) @@ -148,7 +145,7 @@ func (cl *Client) BlockdUpdate(blockdName string) (an interface{}, err error) { return nil, fmt.Errorf("%s: %d %s", logp, res.Code, res.Message) } - return hb, nil + return blockd, nil } // Caches fetch all of non-local caches from server. diff --git a/cmd/resolver/resolver.go b/cmd/resolver/resolver.go index 977b391..9cad5be 100644 --- a/cmd/resolver/resolver.go +++ b/cmd/resolver/resolver.go @@ -51,8 +51,8 @@ func (rsol *resolver) doCmdBlockd(args []string) { resc = rsol.newRescachedClient() hostBlockd map[string]*rescached.Blockd - hb interface{} - hbjson []byte + blockd *rescached.Blockd + vbytes []byte subCmd string err error ) @@ -68,12 +68,12 @@ func (rsol *resolver) doCmdBlockd(args []string) { log.Fatalf("resolver: %s: %s", rsol.cmd, err) } - hbjson, err = json.MarshalIndent(hostBlockd, "", " ") + vbytes, err = json.MarshalIndent(hostBlockd, "", " ") if err != nil { log.Fatalf("resolver: %s: %s", rsol.cmd, err) } - fmt.Println(string(hbjson)) + fmt.Println(string(vbytes)) case subCmdDisable: args = args[1:] @@ -81,17 +81,17 @@ func (rsol *resolver) doCmdBlockd(args []string) { log.Fatalf("resolver: %s %s: missing argument", rsol.cmd, subCmd) } - hb, err = resc.BlockdDisable(args[0]) + blockd, err = resc.BlockdDisable(args[0]) if err != nil { log.Fatalf("resolver: %s %s: %s", rsol.cmd, subCmd, err) } - hbjson, err = json.MarshalIndent(hb, "", " ") + vbytes, err = json.MarshalIndent(blockd, "", " ") if err != nil { log.Fatalf("resolver: %s %s: %s", rsol.cmd, subCmd, err) } - fmt.Println(string(hbjson)) + fmt.Println(string(vbytes)) case subCmdEnable: args = args[1:] @@ -99,17 +99,17 @@ func (rsol *resolver) doCmdBlockd(args []string) { log.Fatalf("resolver: %s %s: missing argument", rsol.cmd, subCmd) } - hb, err = resc.BlockdEnable(args[0]) + blockd, err = resc.BlockdEnable(args[0]) if err != nil { log.Fatalf("resolver: %s %s: %s", rsol.cmd, subCmd, err) } - hbjson, err = json.MarshalIndent(hb, "", " ") + vbytes, err = json.MarshalIndent(blockd, "", " ") if err != nil { log.Fatalf("resolver: %s %s: %s", rsol.cmd, subCmd, err) } - fmt.Println(string(hbjson)) + fmt.Println(string(vbytes)) case subCmdUpdate: args = args[1:] @@ -117,17 +117,17 @@ func (rsol *resolver) doCmdBlockd(args []string) { log.Fatalf("resolver: %s %s: missing argument", rsol.cmd, subCmd) } - hb, err = resc.BlockdUpdate(args[0]) + blockd, err = resc.BlockdUpdate(args[0]) if err != nil { log.Fatalf("resolver: %s %s: %s", rsol.cmd, subCmd, err) } - hbjson, err = json.MarshalIndent(hb, "", " ") + vbytes, err = json.MarshalIndent(blockd, "", " ") if err != nil { log.Fatalf("resolver: %s %s: %s", rsol.cmd, subCmd, err) } - fmt.Println(string(hbjson)) + fmt.Println(string(vbytes)) default: log.Fatalf("resolver: %s: unknown sub command: %s", rsol.cmd, subCmd) -- cgit v1.3