Skip to content

Commit

Permalink
#287: Bump proto and util to v2 and remove old log v1 references
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvandeberg
mvandeberg committed Mar 25, 2024
1 parent e4d84f1 commit 9f0e346
Show file tree
Hide file tree
Showing 22 changed files with 57 additions and 66 deletions.
2 changes: 1 addition & 1 deletion cmd/koinos-p2p/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/koinos/koinos-p2p/internal/node"
"github.com/koinos/koinos-p2p/internal/options"
"github.com/koinos/koinos-p2p/internal/rpc"
util "github.com/koinos/koinos-util-golang"
util "github.com/koinos/koinos-util-golang/v2"
flag "github.com/spf13/pflag"
)

Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ go 1.20
require (
filippo.io/keygen v0.0.0-20230306160926-5201437acf8e
github.com/ipfs/go-log v1.0.5
github.com/koinos/koinos-log-golang v1.0.0
github.com/koinos/koinos-log-golang/v2 v2.0.0
github.com/koinos/koinos-mq-golang v1.0.0
github.com/koinos/koinos-proto-golang v1.4.1-0.20240320151344-141350779acd
github.com/koinos/koinos-util-golang v1.1.0
github.com/koinos/koinos-proto-golang/v2 v2.0.1
github.com/koinos/koinos-util-golang/v2 v2.0.0
github.com/libp2p/go-libp2p v0.30.0
github.com/libp2p/go-libp2p-gorpc v0.5.0
github.com/libp2p/go-libp2p-kad-dht v0.25.0
Expand Down Expand Up @@ -64,6 +63,7 @@ require (
github.com/jbenet/goprocess v0.1.4 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/koinos/koinos-log-golang v1.0.0 // indirect
github.com/koron/go-ssdp v0.0.4 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-cidranger v1.1.0 // indirect
Expand Down
17 changes: 4 additions & 13 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,6 @@ github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSa
github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY=
github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA=
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
Expand Down Expand Up @@ -969,19 +968,11 @@ github.com/koinos/koinos-log-golang/v2 v2.0.0 h1:fOFySSI9+cdmIol9W0a4LQ7Bss1sV1p
github.com/koinos/koinos-log-golang/v2 v2.0.0/go.mod h1:P4Xa5LX5Jt+KkzT3CuT9/i2yTrTaJVHN5jd51MM2Tmk=
github.com/koinos/koinos-mq-golang v1.0.0 h1:zEslw0vsJN+Ki0WKZ/S2c+Tc7/BoEKOOyTGiVE0msmQ=
github.com/koinos/koinos-mq-golang v1.0.0/go.mod h1:0tg4BPijVFyjZenhDGWNbWNq6X2pMwmllwA4tqEXEKI=
github.com/koinos/koinos-proto-golang v1.0.0/go.mod h1:ZonOOdmZcuEbRdOqqdfYRA2I4szYHy5aKzUveMWXBog=
github.com/koinos/koinos-proto-golang v1.0.1-0.20221123003957-336b725f600d/go.mod h1:ZonOOdmZcuEbRdOqqdfYRA2I4szYHy5aKzUveMWXBog=
github.com/koinos/koinos-proto-golang v1.4.0/go.mod h1:PlOUon4jm6oN0Jpaw4N8M8DAOGfFjgbhL6M22RNBcJs=
github.com/koinos/koinos-proto-golang v1.4.1-0.20240320151344-141350779acd h1:GD69kuyS/SLkSIleYuuv8Oucd57AVuyZtnGvA+yNrcw=
github.com/koinos/koinos-proto-golang v1.4.1-0.20240320151344-141350779acd/go.mod h1:PlOUon4jm6oN0Jpaw4N8M8DAOGfFjgbhL6M22RNBcJs=
github.com/koinos/koinos-util-golang v1.0.0 h1:OIwBG7L8dLFh3xWwyE2EYd9XRnhH3UnwboddOX1j86w=
github.com/koinos/koinos-util-golang v1.0.0/go.mod h1:E7vZAMfTX7I3r+nKvbO08YsKDb3YxyuVaKV04Kuf3AI=
github.com/koinos/koinos-util-golang v1.0.1-0.20230227201720-214f4cbaf9b1 h1:E5WEW4fbv/OwODGu4WgE2FiBEzphrcjOqOwld8GX6FY=
github.com/koinos/koinos-util-golang v1.0.1-0.20230227201720-214f4cbaf9b1/go.mod h1:Vh7/QpPKO0wvq0W2MRAXilhKG8PM3tRXGD9Jtqi0IDs=
github.com/koinos/koinos-util-golang v1.0.1-0.20240320181411-8d456f5b6439 h1:hPw81Z2NJ0SUu4GWSJf6ZMdU6L2ChIIK9UpP6oUTnhk=
github.com/koinos/koinos-util-golang v1.0.1-0.20240320181411-8d456f5b6439/go.mod h1:gzfqMbbaWQ+7Mnq/L9sRmOFsSzlE6z94/RHn6Qvjvsc=
github.com/koinos/koinos-util-golang v1.1.0 h1:Ks7XEVlOZQ3YgwxUMf5txTHPIGA9EIHaBC0HNJcW4nc=
github.com/koinos/koinos-util-golang v1.1.0/go.mod h1:Vh7/QpPKO0wvq0W2MRAXilhKG8PM3tRXGD9Jtqi0IDs=
github.com/koinos/koinos-proto-golang/v2 v2.0.1 h1:IITpDm7ScWc+F0IWrXPKZBqwskzGqdh6v8khn3tNtXI=
github.com/koinos/koinos-proto-golang/v2 v2.0.1/go.mod h1:NBsQFaRECEbKqKIuRXE3BLR9aNWrRAmasrGlt/VvboY=
github.com/koinos/koinos-util-golang/v2 v2.0.0 h1:0OxpnOAVHTGjabmPtl7HctXB16eWqqQnCNj9t4ZspFQ=
github.com/koinos/koinos-util-golang/v2 v2.0.0/go.mod h1:89amqjqE0hn/EMirC8jQIXVbwCsusguofqmd1BtkK0Q=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0=
github.com/koron/go-ssdp v0.0.4/go.mod h1:oDXq+E5IL5q0U8uSBcoAXzTzInwy5lEgC91HoKtbmZk=
Expand Down
12 changes: 6 additions & 6 deletions internal/node/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ import (

"filippo.io/keygen"

log "github.com/koinos/koinos-log-golang"
log "github.com/koinos/koinos-log-golang/v2"
koinosmq "github.com/koinos/koinos-mq-golang"
"github.com/koinos/koinos-p2p/internal/options"
"github.com/koinos/koinos-p2p/internal/p2p"
"github.com/koinos/koinos-p2p/internal/rpc"
"github.com/koinos/koinos-proto-golang/koinos"
"github.com/koinos/koinos-proto-golang/koinos/broadcast"
prpc "github.com/koinos/koinos-proto-golang/koinos/rpc"
rpcp2p "github.com/koinos/koinos-proto-golang/koinos/rpc/p2p"
util "github.com/koinos/koinos-util-golang"
"github.com/koinos/koinos-proto-golang/v2/koinos"
"github.com/koinos/koinos-proto-golang/v2/koinos/broadcast"
prpc "github.com/koinos/koinos-proto-golang/v2/koinos/rpc"
rpcp2p "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/p2p"
util "github.com/koinos/koinos-util-golang/v2"

libp2p "github.com/libp2p/go-libp2p"
dht "github.com/libp2p/go-libp2p-kad-dht"
Expand Down
8 changes: 4 additions & 4 deletions internal/node/node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"testing"

"github.com/koinos/koinos-p2p/internal/options"
"github.com/koinos/koinos-proto-golang/koinos"
"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/koinos/rpc/block_store"
"github.com/koinos/koinos-proto-golang/koinos/rpc/chain"
"github.com/koinos/koinos-proto-golang/v2/koinos"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/rpc/block_store"
"github.com/koinos/koinos-proto-golang/v2/koinos/rpc/chain"
"github.com/multiformats/go-multihash"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/p2p/applicator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/koinos/koinos-p2p/internal/options"
"github.com/koinos/koinos-p2p/internal/p2perrors"
"github.com/koinos/koinos-p2p/internal/rpc"
"github.com/koinos/koinos-proto-golang/koinos/broadcast"
"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/broadcast"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
)

type blockEntry struct {
Expand Down
10 changes: 5 additions & 5 deletions internal/p2p/applicator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/koinos/koinos-p2p/internal/options"
"github.com/koinos/koinos-p2p/internal/p2perrors"
"github.com/koinos/koinos-proto-golang/koinos"
"github.com/koinos/koinos-proto-golang/koinos/broadcast"
"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/koinos/rpc/block_store"
"github.com/koinos/koinos-proto-golang/koinos/rpc/chain"
"github.com/koinos/koinos-proto-golang/v2/koinos"
"github.com/koinos/koinos-proto-golang/v2/koinos/broadcast"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/rpc/block_store"
"github.com/koinos/koinos-proto-golang/v2/koinos/rpc/chain"
"github.com/multiformats/go-multihash"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/p2p/connection_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"time"

log "github.com/koinos/koinos-log-golang"
log "github.com/koinos/koinos-log-golang/v2"
"github.com/koinos/koinos-p2p/internal/options"
"github.com/koinos/koinos-p2p/internal/rpc"
util "github.com/koinos/koinos-util-golang"
util "github.com/koinos/koinos-util-golang/v2"

gorpc "github.com/libp2p/go-libp2p-gorpc"
"github.com/libp2p/go-libp2p/core/host"
Expand Down
2 changes: 1 addition & 1 deletion internal/p2p/error_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"math"
"time"

log "github.com/koinos/koinos-log-golang"
log "github.com/koinos/koinos-log-golang/v2"
"github.com/koinos/koinos-p2p/internal/options"
"github.com/koinos/koinos-p2p/internal/p2perrors"
"github.com/libp2p/go-libp2p/core/control"
Expand Down
2 changes: 1 addition & 1 deletion internal/p2p/fork_watchdog.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"

"github.com/koinos/koinos-p2p/internal/p2perrors"
"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
)

type pairKey struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/p2p/fork_watchdog_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/koinos/koinos-p2p/internal/p2perrors"
"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
)

func TestForkWatchdog(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions internal/p2p/gossip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"sync/atomic"
"time"

log "github.com/koinos/koinos-log-golang"
log "github.com/koinos/koinos-log-golang/v2"
"github.com/koinos/koinos-p2p/internal/p2perrors"
"github.com/koinos/koinos-p2p/internal/rpc"
"github.com/koinos/koinos-proto-golang/koinos/canonical"
"github.com/koinos/koinos-proto-golang/koinos/protocol"
util "github.com/koinos/koinos-util-golang"
"github.com/koinos/koinos-proto-golang/v2/koinos/canonical"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
util "github.com/koinos/koinos-util-golang/v2"
pubsub "github.com/libp2p/go-libp2p-pubsub"
"github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/peer"
Expand Down
2 changes: 1 addition & 1 deletion internal/p2p/gossip_toggle.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"time"

log "github.com/koinos/koinos-log-golang"
log "github.com/koinos/koinos-log-golang/v2"
"github.com/koinos/koinos-p2p/internal/options"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/p2p/lib_provider.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package p2p

import "github.com/koinos/koinos-proto-golang/koinos"
import "github.com/koinos/koinos-proto-golang/v2/koinos"

// LastIrreversibleBlockProvider is an interface for providing the last irreversible block to PeerConnection
type LastIrreversibleBlockProvider interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/p2p/peer_connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"time"

log "github.com/koinos/koinos-log-golang"
log "github.com/koinos/koinos-log-golang/v2"
"github.com/koinos/koinos-p2p/internal/options"
"github.com/koinos/koinos-p2p/internal/p2perrors"
"github.com/koinos/koinos-p2p/internal/rpc"
Expand Down
4 changes: 2 additions & 2 deletions internal/p2p/transaction_cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"sync"
"time"

log "github.com/koinos/koinos-log-golang"
"github.com/koinos/koinos-proto-golang/koinos/protocol"
log "github.com/koinos/koinos-log-golang/v2"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
)

type void struct{}
Expand Down
2 changes: 1 addition & 1 deletion internal/p2p/transaction_cache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
"github.com/stretchr/testify/assert"
)

Expand Down
10 changes: 5 additions & 5 deletions internal/p2p_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"github.com/koinos/koinos-p2p/internal/node"
"github.com/koinos/koinos-p2p/internal/options"
"github.com/koinos/koinos-p2p/internal/p2p"
"github.com/koinos/koinos-proto-golang/koinos"
"github.com/koinos/koinos-proto-golang/koinos/broadcast"
"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/koinos/rpc/block_store"
"github.com/koinos/koinos-proto-golang/koinos/rpc/chain"
"github.com/koinos/koinos-proto-golang/v2/koinos"
"github.com/koinos/koinos-proto-golang/v2/koinos/broadcast"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/rpc/block_store"
"github.com/koinos/koinos-proto-golang/v2/koinos/rpc/chain"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/multiformats/go-multiaddr"
"github.com/multiformats/go-multihash"
Expand Down
14 changes: 7 additions & 7 deletions internal/rpc/koinos_rpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (

koinosmq "github.com/koinos/koinos-mq-golang"
"github.com/koinos/koinos-p2p/internal/p2perrors"
"github.com/koinos/koinos-proto-golang/koinos/broadcast"
"github.com/koinos/koinos-proto-golang/koinos/canonical"
"github.com/koinos/koinos-proto-golang/koinos/chain"
"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/koinos/rpc"
"github.com/koinos/koinos-proto-golang/koinos/rpc/block_store"
chainrpc "github.com/koinos/koinos-proto-golang/koinos/rpc/chain"
"github.com/koinos/koinos-proto-golang/v2/koinos/broadcast"
"github.com/koinos/koinos-proto-golang/v2/koinos/canonical"
"github.com/koinos/koinos-proto-golang/v2/koinos/chain"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/rpc"
"github.com/koinos/koinos-proto-golang/v2/koinos/rpc/block_store"
chainrpc "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/chain"
"github.com/multiformats/go-multihash"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/rpc/local_rpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package rpc
import (
"context"

"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/koinos/rpc/block_store"
"github.com/koinos/koinos-proto-golang/koinos/rpc/chain"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/rpc/block_store"
"github.com/koinos/koinos-proto-golang/v2/koinos/rpc/chain"
"github.com/multiformats/go-multihash"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/rpc/peer_rpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"

"github.com/koinos/koinos-p2p/internal/p2perrors"
"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
gorpc "github.com/libp2p/go-libp2p-gorpc"
peer "github.com/libp2p/go-libp2p/core/peer"
"github.com/multiformats/go-multihash"
Expand Down
2 changes: 1 addition & 1 deletion internal/rpc/remote_rpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package rpc
import (
"context"

"github.com/koinos/koinos-proto-golang/koinos/protocol"
"github.com/koinos/koinos-proto-golang/v2/koinos/protocol"
"github.com/multiformats/go-multihash"
)

Expand Down

0 comments on commit 9f0e346

Please sign in to comment.