fix_: rebase

status-im · Oct 18, 2024 · 8198ac1 · 8198ac1
1 parent 3107c1e
commit 8198ac1
Show file tree

Hide file tree

Showing 6 changed files with 1,019 additions and 685 deletions.
diff --git a/third_party/nwaku b/third_party/nwaku
diff --git a/wakuv2/api.go b/wakuv2/api.go
@@ -513,4 +513,4 @@ func (api *PublicWakuAPI) NewMessageFilter(req Criteria) (string, error) {
 	api.mu.Unlock()
 
 	return id, nil
-} */
+} */
diff --git a/wakuv2/history_processor_wrapper.go b/wakuv2/history_processor_wrapper.go
@@ -3,7 +3,6 @@ package wakuv2
 import (
 	"github.com/libp2p/go-libp2p/core/peer"
 
-	"github.com/status-im/status-go/wakuv2/common"
 	"github.com/waku-org/go-waku/waku/v2/api/history"
 	"github.com/waku-org/go-waku/waku/v2/protocol"
 )
@@ -17,7 +16,9 @@ func NewHistoryProcessorWrapper(waku *Waku) history.HistoryProcessor {
 }
 
 func (hr *HistoryProcessorWrapper) OnEnvelope(env *protocol.Envelope, processEnvelopes bool) error {
-	return hr.waku.OnNewEnvelopes(env, common.StoreMessageType, processEnvelopes)
+	// TODO-nwaku
+	// return hr.waku.OnNewEnvelopes(env, common.StoreMessageType, processEnvelopes)
+	return nil
 }
 
 func (hr *HistoryProcessorWrapper) OnRequestFailed(requestID []byte, peerID peer.ID, err error) {

diff --git a/wakuv2/message_publishing.go b/wakuv2/message_publishing.go
@@ -1,5 +1,6 @@
 package wakuv2
 
+/* TODO-nwaku
 import (
 	"errors"
 
@@ -116,3 +117,4 @@ func (w *Waku) publishEnvelope(envelope *protocol.Envelope) {
 		})
 	}
 }
+*/
+1 −1		.github/workflows/auto_assign_pr.yml
+7 −4		.github/workflows/ci.yml
+1 −1		.github/workflows/container-image.yml
+2 −2		.github/workflows/pr-lint.yml
+3 −3		.github/workflows/pre-release.yml
+1 −1		.github/workflows/release-assets.yml
+1 −1		.github/workflows/sync-labels.yml
+16 −0		library/libwaku.h
+67 −34		library/libwaku.nim
+6 −2		library/waku_thread/inter_thread_communication/requests/debug_node_request.nim
+3 −2		library/waku_thread/inter_thread_communication/requests/discovery_request.nim
+32 −12		library/waku_thread/inter_thread_communication/requests/peer_manager_request.nim
+32 −2		waku/common/databases/db_postgres/dbconn.nim
+3 −1		waku/factory/node_factory.nim
+6 −1		waku/node/peer_manager/peer_manager.nim
+4 −0		waku/waku_archive/archive.nim
+4 −3		waku/waku_peer_exchange/protocol.nim
-Original file line number
+Diff line change
@@ Expand Up @@
     	api.mu.Unlock()
     	return id, nil
-    } */
+    } */