From 433c4a90f48b8a8c8974d555a77ac5e833d05ec2 Mon Sep 17 00:00:00 2001 From: darshankabariya Date: Tue, 16 Dec 2025 03:06:15 +0530 Subject: [PATCH] chore: align with rename --- .gitmodules | 2 +- README.md | 22 +++++++++++----------- go.mod | 6 +++--- go.sum | 12 ++++++------ waku/common/envelope.go | 2 +- waku/nwaku.go | 4 ++-- waku/nwaku_test.go | 4 ++-- waku/nwaku_test_utils.go | 2 +- waku/relay_test.go | 2 +- waku/store_test.go | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.gitmodules b/.gitmodules index abfaf25..9a9f5e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "third_party/nwaku"] path = third_party/nwaku - url = https://github.com/waku-org/nwaku.git + url = https://github.com/logos-messaging/logos-messaging-nim.git diff --git a/README.md b/README.md index 4496047..9e97659 100644 --- a/README.md +++ b/README.md @@ -10,24 +10,24 @@ go get -u github.com/logos-messaging/logos-messaging-go-bindings ## Dependencies -This repository doesn't download or build `nwaku`. You must provide `libwaku` and its headers. +This repository doesn't download or build `logos-messaging-nim`. You must provide `libwaku` and its headers. To do so, you can: -- Build `libwaku` from https://github.com/waku-org/nwaku. +- Build `libwaku` from https://github.com/logos-messaging/logos-messaging-nim. - Point `cgo` to the headers and compiled library when building your project. -Example environment setup (adjust paths to your nwaku checkout): +Example environment setup (adjust paths to your logos-messaging-nim checkout): ``` -export NWAKU_DIR=/path/to/nwaku -export CGO_CFLAGS="-I${NWAKU_DIR}/library" -export CGO_LDFLAGS="-L${NWAKU_DIR}/build -lwaku -Wl,-rpath,${NWAKU_DIR}/build" +export LMN_DIR=/path/to/logos-messaging-nim +export CGO_CFLAGS="-I${LMN_DIR}/library" +export CGO_LDFLAGS="-L${LMN_DIR}/build -lwaku -Wl,-rpath,${LMN_DIR}/build" ``` Such setup would look like this in a `Makefile`: ```Makefile -NWAKU_DIR ?= /path/to/nwaku -CGO_CFLAGS = -I$(NWAKU_DIR)/library -CGO_LDFLAGS = -L$(NWAKU_DIR)/build -lwaku -Wl,-rpath,$(NWAKU_DIR)/build +LMN_DIR ?= /path/to/logos-messaging-nim +CGO_CFLAGS = -I$(LMN_DIR)/library +CGO_LDFLAGS = -L$(LMN_DIR)/build -lwaku -Wl,-rpath,$(LMN_DIR)/build build: ## Your project build command go build ./... @@ -35,11 +35,11 @@ build: ## Your project build command For a reference integration, see how `status-go` wires `CGO_CFLAGS` and `CGO_LDFLAGS` in its build setup. -NOTE: If your project is itself used as a Go dependency, all its clients will have to follow the same nwaku setup. +NOTE: If your project is itself used as a Go dependency, all its clients will have to follow the same logos-messaging-nim setup. ## Development -When working on this repository itself, `nwaku` is included as a git submodule for convenience. +When working on this repository itself, `logos-messaging-nim` is included as a git submodule for convenience. - Initialize and update the submodule, then build `libwaku` ```sh diff --git a/go.mod b/go.mod index bbfeb1d..3fdbaf4 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ replace github.com/forPelevin/gomoji => github.com/status-im/gomoji v1.1.3-0.202 replace github.com/mutecomm/go-sqlcipher/v4 v4.4.2 => github.com/status-im/go-sqlcipher/v4 v4.5.4-status.3 -replace github.com/libp2p/go-libp2p-pubsub v0.12.0 => github.com/waku-org/go-libp2p-pubsub v0.12.0-gowaku.0.20240823143342-b0f2429ca27f +replace github.com/libp2p/go-libp2p-pubsub v0.12.0 => github.com/logos-messaging/go-libp2p-pubsub v0.12.0-gowaku.0.20240823143342-b0f2429ca27f require ( github.com/beevik/ntp v0.3.0 // indirect @@ -38,7 +38,7 @@ require ( google.golang.org/protobuf v1.34.2 ) -require github.com/waku-org/go-waku v0.8.1-0.20241028194639-dd82c24e0057 +require github.com/logos-messaging/logos-messaging-go v0.8.1-0.20241028194639-dd82c24e0057 require ( github.com/beorn7/perks v1.0.1 // indirect @@ -73,7 +73,7 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/waku-org/go-discover v0.0.0-20240506173252-4912704efdc5 // indirect + github.com/logos-messaging/go-discover v0.0.0-20240506173252-4912704efdc5 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect golang.org/x/net v0.28.0 // indirect diff --git a/go.sum b/go.sum index dcf97e7..8f58b7e 100644 --- a/go.sum +++ b/go.sum @@ -549,12 +549,12 @@ github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/X github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/waku-org/go-discover v0.0.0-20240506173252-4912704efdc5 h1:4K3IS97JryAEV8pRXB//qPcg+8bPXl/O+AOLt3FeCKc= -github.com/waku-org/go-discover v0.0.0-20240506173252-4912704efdc5/go.mod h1:eBHgM6T4EG0RZzxpxKy+rGz/6Dw2Nd8DWxS0lm9ESDw= -github.com/waku-org/go-libp2p-pubsub v0.12.0-gowaku.0.20240823143342-b0f2429ca27f h1:4dQcthDPhxQIY96BFm6Ab2m57+I/z9+FgaYnIER6IfM= -github.com/waku-org/go-libp2p-pubsub v0.12.0-gowaku.0.20240823143342-b0f2429ca27f/go.mod h1:Oi0zw9aw8/Y5GC99zt+Ef2gYAl+0nZlwdJonDyOz/sE= -github.com/waku-org/go-waku v0.8.1-0.20241028194639-dd82c24e0057 h1:C/UCg3Z4avOxvZEvY0JzYmeAoqZUBnSE6PK/SaxfEAM= -github.com/waku-org/go-waku v0.8.1-0.20241028194639-dd82c24e0057/go.mod h1:1BRnyg2mQ2aBNLTBaPq6vEvobzywGykPOhGQFbHGf74= +github.com/logos-messaging/go-discover v0.0.0-20240506173252-4912704efdc5 h1:4K3IS97JryAEV8pRXB//qPcg+8bPXl/O+AOLt3FeCKc= +github.com/logos-messaging/go-discover v0.0.0-20240506173252-4912704efdc5/go.mod h1:eBHgM6T4EG0RZzxpxKy+rGz/6Dw2Nd8DWxS0lm9ESDw= +github.com/logos-messaging/go-libp2p-pubsub v0.12.0-gowaku.0.20240823143342-b0f2429ca27f h1:4dQcthDPhxQIY96BFm6Ab2m57+I/z9+FgaYnIER6IfM= +github.com/logos-messaging/go-libp2p-pubsub v0.12.0-gowaku.0.20240823143342-b0f2429ca27f/go.mod h1:Oi0zw9aw8/Y5GC99zt+Ef2gYAl+0nZlwdJonDyOz/sE= +github.com/logos-messaging/logos-messaging-go v0.8.1-0.20241028194639-dd82c24e0057 h1:C/UCg3Z4avOxvZEvY0JzYmeAoqZUBnSE6PK/SaxfEAM= +github.com/logos-messaging/logos-messaging-go v0.8.1-0.20241028194639-dd82c24e0057/go.mod h1:1BRnyg2mQ2aBNLTBaPq6vEvobzywGykPOhGQFbHGf74= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/wlynxg/anet v0.0.4 h1:0de1OFQxnNqAu+x2FAKKCVIrnfGKQbs7FQz++tB0+Uw= github.com/wlynxg/anet v0.0.4/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA= diff --git a/waku/common/envelope.go b/waku/common/envelope.go index 19926c2..3fd6c08 100644 --- a/waku/common/envelope.go +++ b/waku/common/envelope.go @@ -3,7 +3,7 @@ package common import ( "encoding/json" - "github.com/waku-org/go-waku/waku/v2/protocol/pb" + "github.com/logos-messaging/logos-messaging-go/waku/v2/protocol/pb" ) // Envelope contains information about the pubsub topic of a WakuMessage diff --git a/waku/nwaku.go b/waku/nwaku.go index 212cd09..9a57e90 100644 --- a/waku/nwaku.go +++ b/waku/nwaku.go @@ -359,8 +359,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" libp2pproto "github.com/libp2p/go-libp2p/core/protocol" "github.com/multiformats/go-multiaddr" - "github.com/waku-org/go-waku/waku/v2/protocol/pb" - "github.com/waku-org/go-waku/waku/v2/utils" + "github.com/logos-messaging/logos-messaging-go/waku/v2/protocol/pb" + "github.com/logos-messaging/logos-messaging-go/waku/v2/utils" "github.com/logos-messaging/logos-messaging-go-bindings/waku/common" ) diff --git a/waku/nwaku_test.go b/waku/nwaku_test.go index 59ccb09..a467bac 100644 --- a/waku/nwaku_test.go +++ b/waku/nwaku_test.go @@ -16,8 +16,8 @@ import ( "github.com/logos-messaging/logos-messaging-go-bindings/waku/common" ma "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/require" - "github.com/waku-org/go-waku/waku/v2/protocol/pb" - "github.com/waku-org/go-waku/waku/v2/protocol/store" + "github.com/logos-messaging/logos-messaging-go/waku/v2/protocol/pb" + "github.com/logos-messaging/logos-messaging-go/waku/v2/protocol/store" ) // In order to run this test, you must run an nwaku node diff --git a/waku/nwaku_test_utils.go b/waku/nwaku_test_utils.go index 75c07c0..5464850 100644 --- a/waku/nwaku_test_utils.go +++ b/waku/nwaku_test_utils.go @@ -18,7 +18,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/logos-messaging/logos-messaging-go-bindings/utils" "github.com/logos-messaging/logos-messaging-go-bindings/waku/common" - "github.com/waku-org/go-waku/waku/v2/protocol/pb" + "github.com/logos-messaging/logos-messaging-go/v2/protocol/pb" "google.golang.org/protobuf/proto" ) diff --git a/waku/relay_test.go b/waku/relay_test.go index 414bbbe..128d694 100644 --- a/waku/relay_test.go +++ b/waku/relay_test.go @@ -9,7 +9,7 @@ import ( "github.com/cenkalti/backoff/v3" "github.com/logos-messaging/logos-messaging-go-bindings/waku/common" "github.com/stretchr/testify/require" - "github.com/waku-org/go-waku/waku/v2/protocol/pb" + "github.com/logos-messaging/logos-messaging-go/waku/v2/protocol/pb" "google.golang.org/protobuf/proto" ) diff --git a/waku/store_test.go b/waku/store_test.go index befedc4..414e4cc 100644 --- a/waku/store_test.go +++ b/waku/store_test.go @@ -7,7 +7,7 @@ import ( "github.com/cenkalti/backoff/v3" "github.com/stretchr/testify/require" - "github.com/waku-org/go-waku/waku/v2/protocol/pb" + "github.com/logos-messaging/logos-messaging-go/waku/v2/protocol/pb" "github.com/logos-messaging/logos-messaging-go-bindings/waku/common" "google.golang.org/protobuf/proto"