From 24bc7b65e1d301bf136a632de38361e0bba85878 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 2 Apr 2024 16:16:52 -0400 Subject: [PATCH] chore(deps): upgrade gouroboros to 0.77.0 (#166) Signed-off-by: Chris Gianelloni --- .github/workflows/go-test.yml | 2 +- .github/workflows/publish.yml | 2 +- go.mod | 4 ++-- go.sum | 10 +++++++-- node.go | 41 ----------------------------------- 5 files changed, 12 insertions(+), 47 deletions(-) diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index 14ed4fa..f4ac486 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -13,7 +13,7 @@ jobs: name: go-test strategy: matrix: - go-version: [1.20.x, 1.21.x] + go-version: [1.21.x, 1.22.x] # XXX: is it actually useful to run unit tests on macOS? platform: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.platform }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 21dc291..738fe81 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -50,7 +50,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.21.x - name: Build binary run: GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} make build - name: Upload release asset diff --git a/go.mod b/go.mod index 4e14ed4..444af61 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module github.com/blinklabs-io/nview -go 1.20 +go 1.21 require ( - github.com/blinklabs-io/gouroboros v0.76.0 + github.com/blinklabs-io/gouroboros v0.77.0 github.com/gdamore/tcell/v2 v2.7.4 github.com/kelseyhightower/envconfig v1.4.0 github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c diff --git a/go.sum b/go.sum index 3669b41..47a0e0b 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ -github.com/blinklabs-io/gouroboros v0.76.0 h1:o1GHNW/p3AYEd2ubfZTQb6FWmyt2zKCZEwg5k8J4Pbc= -github.com/blinklabs-io/gouroboros v0.76.0/go.mod h1:+EKdUQk5CUtXF/WI2N7mrOxIQSRW0VEaYENffS3I4GM= +github.com/blinklabs-io/gouroboros v0.77.0 h1:uNRpuE4zyJiqgLKM4Ynw8w6EvuCzgEvF4cyphYikKmc= +github.com/blinklabs-io/gouroboros v0.77.0/go.mod h1:f4ZNhkQ0vliLlsvb+CmD0nGwTf/IYaIflQCBMyxR0RI= +github.com/blinklabs-io/ouroboros-mock v0.2.0 h1:Wff7mJiFUzktQ5tuWRN9vXNk38wR0ij2Q4bYHwJXaV4= +github.com/blinklabs-io/ouroboros-mock v0.2.0/go.mod h1:t9eIDjmj339GJtfV7jandJnCqmj8WkZsFg2N1TR68io= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -56,6 +58,7 @@ github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/shirou/gopsutil/v3 v3.24.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE= github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -83,6 +86,7 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= @@ -94,6 +98,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -132,6 +137,7 @@ google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGm google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/node.go b/node.go index 6f919dc..f7ee91e 100644 --- a/node.go +++ b/node.go @@ -149,47 +149,6 @@ func getGenesisConfig(cfg *config.Config) *localstatequery.GenesisConfigResult { return result } -// Get Protocol Parameters from a running node using Ouroboros NtC -// -//nolint:unused -func getProtocolParams( - cfg *config.Config, -) *localstatequery.CurrentProtocolParamsResult { - var result *localstatequery.CurrentProtocolParamsResult - // Get a connection and setup our error channels - conn := createClientConnection(cfg) - if conn == nil { - return result - } - errorChan := make(chan error) - go func() { - for { - err := <-errorChan - fmt.Printf("ERROR: %s\n", err) - os.Exit(1) - } - }() - // Configure our Ouroboros connection - oConn, err := ouroboros.NewConnection( - ouroboros.WithConnection(conn), - ouroboros.WithNetworkMagic(uint32(cfg.Node.NetworkMagic)), - ouroboros.WithErrorChan(errorChan), - ouroboros.WithNodeToNode(false), - ouroboros.WithKeepAlive(false), - ouroboros.WithLocalStateQueryConfig(buildLocalStateQueryConfig()), - ) - if err != nil { - return result - } - // Query our client - oConn.LocalStateQuery().Client.Start() - result, err = oConn.LocalStateQuery().Client.GetCurrentProtocolParams() - if err != nil { - return result - } - return result -} - // Get remote tip // //nolint:unused