Skip to content

Commit 459022f

Browse files
aopoltorzhickyaopoltorzhicky
committed
Remove deprecated functions. TzKT API methods
1 parent dce34b9 commit 459022f

File tree

13 files changed

+105
-65
lines changed

13 files changed

+105
-65
lines changed

‎config/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package config
22

33
import (
44
"bytes"
5-
"io/ioutil"
5+
"os"
66

77
"github.com/go-playground/validator/v10"
88
"github.com/pkg/errors"
@@ -117,7 +117,7 @@ func readFile(filename string) (*bytes.Buffer, error) {
117117
return nil, errors.Errorf("you have to provide configuration filename")
118118
}
119119

120-
data, err := ioutil.ReadFile(filename)
120+
data, err := os.ReadFile(filename)
121121
if err != nil {
122122
return nil, errors.Wrapf(err, "reading file %s", filename)
123123
}

‎config/parsing.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package config
22

33
import (
44
"bytes"
5-
"io/ioutil"
5+
"io"
66
"os"
77

88
"golang.org/x/text/transform"
99
)
1010

1111
func expandVariables(data []byte) ([]byte, error) {
12-
return ioutil.ReadAll(transform.NewReader(bytes.NewBuffer(data), newExpandTransformer()))
12+
return io.ReadAll(transform.NewReader(bytes.NewBuffer(data), newExpandTransformer()))
1313
}
1414

1515
// expandTransformer implements transform.Transformer

‎hasura/hasura.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package hasura
33
import (
44
"context"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"os"
88
"reflect"
99
"strings"
@@ -99,9 +99,7 @@ func Create(ctx context.Context, args GenerateArgs) error {
9999
// TODO: maybe instead replace tables by name.
100100
selectedSource.Tables = make([]Table, 0)
101101
// Insert generated tables
102-
for _, table := range metadata.Sources[0].Tables {
103-
selectedSource.Tables = append(selectedSource.Tables, table)
104-
}
102+
selectedSource.Tables = append(selectedSource.Tables, metadata.Sources[0].Tables...)
105103

106104
if err := createQueryCollections(&export); err != nil {
107105
return err
@@ -274,7 +272,7 @@ func createQueryCollections(metadata *Metadata) error {
274272
return nil
275273
}
276274

277-
files, err := ioutil.ReadDir("graphql")
275+
files, err := os.ReadDir("graphql")
278276
if err != nil {
279277
if os.IsNotExist(err) {
280278
return nil
@@ -297,7 +295,7 @@ func createQueryCollections(metadata *Metadata) error {
297295
}
298296
defer f.Close()
299297

300-
data, err := ioutil.ReadAll(f)
298+
data, err := io.ReadAll(f)
301299
if err != nil {
302300
return err
303301
}
@@ -343,7 +341,7 @@ func mergeQueries(a []Query, b []Query) []Query {
343341

344342
// ReadCustomConfigs -
345343
func ReadCustomConfigs(ctx context.Context, database config.Database, hasuraConfigDir string) ([]Request, error) {
346-
files, err := ioutil.ReadDir(hasuraConfigDir)
344+
files, err := os.ReadDir(hasuraConfigDir)
347345
if err != nil {
348346
return nil, err
349347
}
@@ -355,7 +353,7 @@ func ReadCustomConfigs(ctx context.Context, database config.Database, hasuraConf
355353
}
356354

357355
path := fmt.Sprintf("%s/%s", hasuraConfigDir, files[i].Name())
358-
raw, err := ioutil.ReadFile(path)
356+
raw, err := os.ReadFile(path)
359357
if err != nil {
360358
return nil, err
361359
}

‎node/request.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"context"
66
"io"
7-
"io/ioutil"
87
"net/http"
98
"net/url"
109
"path"
@@ -64,7 +63,7 @@ func (r *request) checkStatusCode(resp *http.Response) error {
6463
if resp.StatusCode == http.StatusOK {
6564
return nil
6665
}
67-
data, err := ioutil.ReadAll(resp.Body)
66+
data, err := io.ReadAll(resp.Body)
6867
if err != nil {
6968
return RequestError{
7069
Code: resp.StatusCode,
@@ -103,5 +102,5 @@ func (r *request) doWithBytesResponse(ctx context.Context, client *client) ([]by
103102
return nil, err
104103
}
105104

106-
return ioutil.ReadAll(resp.Body)
105+
return io.ReadAll(resp.Body)
107106
}

‎tools/formatter/error/formatter_error_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package formattererror
33
import (
44
"encoding/json"
55
"fmt"
6-
"io/ioutil"
6+
"os"
77
"testing"
88

99
"github.com/tidwall/gjson"
@@ -29,18 +29,18 @@ func TestLocateContractError(t *testing.T) {
2929
t.Run(c, func(t *testing.T) {
3030
dirpath := fmt.Sprintf("formatter_error_tests/%v/", c)
3131

32-
data, err := ioutil.ReadFile(dirpath + "code.json")
32+
data, err := os.ReadFile(dirpath + "code.json")
3333
if err != nil {
34-
t.Errorf("error in ioutil.ReadFile(%v%v): %v", dirpath, "code.json", err)
34+
t.Errorf("error in os.ReadFile(%v%v): %v", dirpath, "code.json", err)
3535
}
3636

3737
if !gjson.Valid(string(data)) {
3838
t.Error("invalid json")
3939
}
4040

41-
results, err := ioutil.ReadFile(dirpath + "results.json")
41+
results, err := os.ReadFile(dirpath + "results.json")
4242
if err != nil {
43-
t.Errorf("error in ioutil.ReadFile(%v%v): %v", dirpath, "results.json", err)
43+
t.Errorf("error in os.ReadFile(%v%v): %v", dirpath, "results.json", err)
4444
}
4545

4646
var res Results

‎tools/formatter/formatter_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package formatter
22

33
import (
44
"fmt"
5-
"io/ioutil"
5+
"os"
66
"regexp"
77
"strings"
88
"testing"
@@ -102,9 +102,9 @@ func TestMichelineToMichelson(t *testing.T) {
102102
t.Run(tt, func(t *testing.T) {
103103
jsonFile := fmt.Sprintf("./formatter_tests/%v/code_%v.json", tt, tt[:6])
104104

105-
data, err := ioutil.ReadFile(jsonFile)
105+
data, err := os.ReadFile(jsonFile)
106106
if err != nil {
107-
t.Error("ioutil.ReadFile code.json error:", err)
107+
t.Error("os.ReadFile code.json error:", err)
108108
}
109109

110110
if !gjson.Valid(string(data)) {
@@ -118,9 +118,9 @@ func TestMichelineToMichelson(t *testing.T) {
118118
}
119119

120120
tzFile := fmt.Sprintf("./formatter_tests/%v/code_%v.tz", tt, tt[:6])
121-
expected, err := ioutil.ReadFile(tzFile)
121+
expected, err := os.ReadFile(tzFile)
122122
if err != nil {
123-
t.Error("ioutil.ReadFile code.tz error:", err)
123+
t.Error("os.ReadFile code.tz error:", err)
124124
}
125125

126126
re := regexp.MustCompile(`\n\s*`)

‎tools/translator/converter.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package translator
22

33
import (
4-
"io/ioutil"
4+
"os"
55
"regexp"
66

77
"github.com/yhirose/go-peg"
@@ -63,7 +63,7 @@ func (c Converter) FromString(input string) (string, error) {
6363
}
6464

6565
func readFileToString(filename string) (string, error) {
66-
data, err := ioutil.ReadFile(filename)
66+
data, err := os.ReadFile(filename)
6767
if err != nil {
6868
return "", err
6969
}

‎tools/translator/converter_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ package translator
22

33
import (
44
"fmt"
5-
"io/ioutil"
5+
"os"
66
"testing"
77

88
"github.com/stretchr/testify/assert"
99
)
1010

1111
func TestConverter_FromFile(t *testing.T) {
12-
files, err := ioutil.ReadDir("./tests/")
12+
files, err := os.ReadDir("./tests/")
1313
if err != nil {
14-
t.Errorf("ioutil.ReadDir(./tests/) error = %v", err)
14+
t.Errorf("os.ReadDir(./tests/) error = %v", err)
1515
return
1616
}
1717

@@ -27,9 +27,9 @@ func TestConverter_FromFile(t *testing.T) {
2727

2828
t.Run(file.Name(), func(t *testing.T) {
2929
resultFilename := fmt.Sprintf("tests/%s/code.json", file.Name())
30-
resultBytes, err := ioutil.ReadFile(resultFilename)
30+
resultBytes, err := os.ReadFile(resultFilename)
3131
if err != nil {
32-
t.Errorf("ioutil.ReadFile() error = %v", err)
32+
t.Errorf("os.ReadFile() error = %v", err)
3333
return
3434
}
3535

‎tzkt/api/api.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"context"
66
"fmt"
77
"io"
8-
"io/ioutil"
98
"net/http"
109
"net/url"
1110
"os"
@@ -134,7 +133,7 @@ func (tzkt *API) count(ctx context.Context, endpoint string, args map[string]str
134133
}
135134
defer resp.Body.Close()
136135

137-
data, err := ioutil.ReadAll(resp.Body)
136+
data, err := io.ReadAll(resp.Body)
138137
if err != nil {
139138
return 0, err
140139
}

‎tzkt/api/contracts.go‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package api
33
import (
44
"context"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"net/http"
88

99
"github.com/dipdup-net/go-lib/tzkt/data"
@@ -31,10 +31,22 @@ func (tzkt *API) BuildContractParameters(ctx context.Context, contract, entrypoi
3131

3232
switch response.StatusCode {
3333
case http.StatusOK:
34-
return ioutil.ReadAll(response.Body)
34+
return io.ReadAll(response.Body)
3535
case http.StatusNoContent:
3636
return nil, nil
3737
default:
3838
return nil, errors.New(fmt.Sprintf("%s: %s %s", response.Status, entrypoint, contract))
3939
}
4040
}
41+
42+
// GetContractByAddress -
43+
func (tzkt *API) GetContractByAddress(ctx context.Context, address string) (response data.Contract, err error) {
44+
err = tzkt.json(ctx, fmt.Sprintf("/v1/contracts/%s", address), nil, false, &response)
45+
return
46+
}
47+
48+
// ListContracts -
49+
func (tzkt *API) ListContracts(ctx context.Context, filters map[string]string) (response []data.Contract, err error) {
50+
err = tzkt.json(ctx, "/v1/contracts", filters, false, &response)
51+
return
52+
}

0 commit comments

Comments
 (0)