chore: update repo according to recent rename

This commit is contained in:
darshankabariya 2025-12-14 01:22:59 +05:30
parent 31fb882511
commit 1b1330eaf9
No known key found for this signature in database
GPG Key ID: 9A92CCD9899F0D22
16 changed files with 45 additions and 45 deletions

View File

@ -31,7 +31,7 @@ jobs:
- name: Install Go dependencies - name: Install Go dependencies
run: go mod download run: go mod download
- name: Build nwaku dependencies - name: Build logos-messaging-nim dependencies
run: make -C waku run: make -C waku
- name: Increase ulimit - name: Increase ulimit

View File

@ -29,7 +29,7 @@ jobs:
- name: Install Go dependencies - name: Install Go dependencies
run: go mod download run: go mod download
- name: Build nwaku dependencies - name: Build logos-messaging-nim dependencies
run: make -C waku run: make -C waku
- name: Increase ulimit - name: Increase ulimit
@ -79,7 +79,7 @@ jobs:
- name: Install Go dependencies - name: Install Go dependencies
run: go mod download run: go mod download
- name: Build nwaku dependencies - name: Build logos-messaging-nim dependencies
run: make -C waku run: make -C waku
- name: Increase ulimit - name: Increase ulimit

6
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "third_party/nwaku"] [submodule "third_party/logos-messaging-nim"]
path = third_party/nwaku path = third_party/logos-messaging-nim
url = https://github.com/waku-org/nwaku.git url = https://github.com/logos-co/logos-messaging-nim.git

View File

@ -1,33 +1,33 @@
# Waku Go Bindings # Logos Messaging Go Bindings
Go bindings for the Waku library. Go bindings for the Logos Messaging library.
## Install ## Install
``` ```
go get -u github.com/waku-org/waku-go-bindings go get -u github.com/logos-co/logos-messaging-go-bindings
``` ```
## Dependencies ## 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: To do so, you can:
- Build `libwaku` from https://github.com/waku-org/nwaku. - Build `libwaku` from https://github.com/logos-co/logos-messaging-nim.
- Point `cgo` to the headers and compiled library when building your project. - 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 LOGOS_MESSAGING_NIM_DIR=/path/to/logos-messaging-nim
export CGO_CFLAGS="-I${NWAKU_DIR}/library" export CGO_CFLAGS="-I${LOGOS_MESSAGING_NIM_DIR}/library"
export CGO_LDFLAGS="-L${NWAKU_DIR}/build -lwaku -Wl,-rpath,${NWAKU_DIR}/build" export CGO_LDFLAGS="-L${LOGOS_MESSAGING_NIM_DIR}/build -lwaku -Wl,-rpath,${LOGOS_MESSAGING_NIM_DIR}/build"
``` ```
Such setup would look like this in a `Makefile`: Such setup would look like this in a `Makefile`:
```Makefile ```Makefile
NWAKU_DIR ?= /path/to/nwaku LOGOS_MESSAGING_NIM_DIR ?= /path/to/logos-messaging-nim
CGO_CFLAGS = -I$(NWAKU_DIR)/library CGO_CFLAGS = -I$(LOGOS_MESSAGING_NIM_DIR)/library
CGO_LDFLAGS = -L$(NWAKU_DIR)/build -lwaku -Wl,-rpath,$(NWAKU_DIR)/build CGO_LDFLAGS = -L$(LOGOS_MESSAGING_NIM_DIR)/build -lwaku -Wl,-rpath,$(LOGOS_MESSAGING_NIM_DIR)/build
build: ## Your project build command build: ## Your project build command
go build ./... 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. 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 ## 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` - Initialize and update the submodule, then build `libwaku`
```sh ```sh

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/waku-org/waku-go-bindings module github.com/logos-co/logos-messaging-go-bindings
go 1.21 go 1.21

View File

@ -6,7 +6,7 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/waku-org/waku-go-bindings/utils" "github.com/logos-co/logos-messaging-go-bindings/utils"
) )
var ( var (

View File

@ -1,9 +1,9 @@
# Makefile for Waku Go Bindings # Makefile for Logos Messaging Go Bindings
# Directories # Directories
THIRD_PARTY_DIR := $(shell pwd)/../third_party THIRD_PARTY_DIR := $(shell pwd)/../third_party
NWAKU_REPO := https://github.com/waku-org/nwaku LOGOS_MESSAGING_NIM_REPO := https://github.com/logos-co/logos-messaging-nim
NWAKU_DIR := $(THIRD_PARTY_DIR)/nwaku LOGOS_MESSAGING_NIM_DIR := $(THIRD_PARTY_DIR)/logos-messaging-nim
.PHONY: all clean build-libwaku build .PHONY: all clean build-libwaku build
@ -13,18 +13,18 @@ all: build
# Build libwaku # Build libwaku
build-libwaku: build-libwaku:
@echo "Building libwaku..." @echo "Building libwaku..."
@cd $(NWAKU_DIR) && make libwaku @cd $(LOGOS_MESSAGING_NIM_DIR) && make libwaku
# Build Waku Go Bindings # Build Logos Messaging Go Bindings
build: export CGO_CFLAGS = "-I${NWAKU_DIR}/library/" build: export CGO_CFLAGS = "-I${LOGOS_MESSAGING_NIM_DIR}/library/"
build: export CGO_LDFLAGS = "-L${NWAKU_DIR}/build/ -lwaku -L${NWAKU_DIR} -Wl,-rpath,${NWAKU_DIR}/build/" build: export CGO_LDFLAGS = "-L${LOGOS_MESSAGING_NIM_DIR}/build/ -lwaku -L${LOGOS_MESSAGING_NIM_DIR} -Wl,-rpath,${LOGOS_MESSAGING_NIM_DIR}/build/"
build: build:
@echo "Building Waku Go Bindings..." @echo "Building Logos Messaging Go Bindings..."
go build ./... go build ./...
# Clean up generated files # Clean up generated files
clean: clean:
@echo "Cleaning up..." @echo "Cleaning up..."
@rm -rf $(THIRD_PARTY_DIR) @rm -rf $(THIRD_PARTY_DIR)
@rm -f waku-go-bindings @rm -f logos-messaging-go-bindings

View File

@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/waku-org/waku-go-bindings/waku/common" "github.com/logos-co/logos-messaging-go-bindings/waku/common"
) )
func TestBasicWakuNodes(t *testing.T) { func TestBasicWakuNodes(t *testing.T) {
@ -29,7 +29,7 @@ func TestBasicWakuNodes(t *testing.T) {
Debug("TestBasicWakuNodes completed successfully") Debug("TestBasicWakuNodes completed successfully")
} }
/* artifact https://github.com/waku-org/waku-go-bindings/issues/40 */ /* artifact https://github.com/logos-co/logos-messaging-go-bindings/issues/40 */
func TestNodeRestart(t *testing.T) { func TestNodeRestart(t *testing.T) {
t.Skip("Skipping test for open artifact ") t.Skip("Skipping test for open artifact ")
Debug("Starting TestNodeRestart") Debug("Starting TestNodeRestart")

View File

@ -346,7 +346,7 @@ import (
"github.com/waku-org/go-waku/waku/v2/protocol/pb" "github.com/waku-org/go-waku/waku/v2/protocol/pb"
"github.com/waku-org/go-waku/waku/v2/utils" "github.com/waku-org/go-waku/waku/v2/utils"
"github.com/waku-org/waku-go-bindings/waku/common" "github.com/logos-co/logos-messaging-go-bindings/waku/common"
) )
const requestTimeout = 30 * time.Second const requestTimeout = 30 * time.Second
@ -366,7 +366,7 @@ func WakuGoCallback(ret C.int, msg *C.char, len C.size_t, resp unsafe.Pointer) {
} }
} }
// WakuNode represents an instance of an nwaku node // WakuNode represents an instance of a logos-messaging-nim node
type WakuNode struct { type WakuNode struct {
wakuCtx unsafe.Pointer wakuCtx unsafe.Pointer
config *common.WakuConfig config *common.WakuConfig
@ -476,7 +476,7 @@ func (n *WakuNode) OnEvent(eventStr string) {
jsonEvent := jsonEvent{} jsonEvent := jsonEvent{}
err := json.Unmarshal([]byte(eventStr), &jsonEvent) err := json.Unmarshal([]byte(eventStr), &jsonEvent)
if err != nil { if err != nil {
Error("could not unmarshal nwaku event string: %v", err) Error("could not unmarshal logos-messaging-nim event string: %v", err)
return return
} }

View File

@ -17,10 +17,10 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/waku-org/go-waku/waku/v2/protocol/pb" "github.com/waku-org/go-waku/waku/v2/protocol/pb"
"github.com/waku-org/go-waku/waku/v2/protocol/store" "github.com/waku-org/go-waku/waku/v2/protocol/store"
"github.com/waku-org/waku-go-bindings/waku/common" "github.com/logos-messaging/logos-messaging-go-bindings/waku/common"
) )
// In order to run this test, you must run an nwaku node // In order to run this test, you must run a logos-messaging-nim node
// //
// Using Docker: // Using Docker:
// //

View File

@ -17,8 +17,8 @@ import (
"github.com/cenkalti/backoff/v3" "github.com/cenkalti/backoff/v3"
"github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/peer"
"github.com/waku-org/go-waku/waku/v2/protocol/pb" "github.com/waku-org/go-waku/waku/v2/protocol/pb"
"github.com/waku-org/waku-go-bindings/utils" "github.com/logos-co/logos-messaging-go-bindings/utils"
"github.com/waku-org/waku-go-bindings/waku/common" "github.com/logos-co/logos-messaging-go-bindings/waku/common"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )

View File

@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/waku-org/waku-go-bindings/waku/common" "github.com/logos-co/logos-messaging-go-bindings/waku/common"
) )
// Test node connect & disconnect peers // Test node connect & disconnect peers

View File

@ -9,7 +9,7 @@ import (
"github.com/cenkalti/backoff/v3" "github.com/cenkalti/backoff/v3"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/waku-org/go-waku/waku/v2/protocol/pb" "github.com/waku-org/go-waku/waku/v2/protocol/pb"
"github.com/waku-org/waku-go-bindings/waku/common" "github.com/logos-co/logos-messaging-go-bindings/waku/common"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )

View File

@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/waku-org/go-waku/waku/v2/protocol/pb" "github.com/waku-org/go-waku/waku/v2/protocol/pb"
"github.com/waku-org/waku-go-bindings/waku/common" "github.com/logos-co/logos-messaging-go-bindings/waku/common"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )

View File

@ -11,7 +11,7 @@ import (
"time" "time"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/waku-org/waku-go-bindings/waku/common" "github.com/logos-co/logos-messaging-go-bindings/waku/common"
// "go.uber.org/zap/zapcore" // "go.uber.org/zap/zapcore"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"

View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/waku-org/waku-go-bindings/waku/common" "github.com/logos-co/logos-messaging-go-bindings/waku/common"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )