fix_: rebase

This commit is contained in:
Richard Ramos 2024-10-17 17:54:13 -04:00
parent 940adb99ec
commit 3f8370ff45
No known key found for this signature in database
GPG Key ID: 1CE87DB518195760
6 changed files with 1009 additions and 675 deletions

2
third_party/nwaku vendored

@ -1 +1 @@
Subproject commit c861fa9f7560068874570598c81b7a1425a9e931
Subproject commit c5a825e206c1cb3e6e0cf8c01410527804cb76c4

View File

@ -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) {

View File

@ -1,5 +1,6 @@
package wakuv2
/* TODO-nwaku
import (
"errors"
@ -116,3 +117,4 @@ func (w *Waku) publishEnvelope(envelope *protocol.Envelope) {
})
}
}
*/

File diff suppressed because it is too large Load Diff

View File

@ -204,7 +204,7 @@ func TestBasicWakuV2(t *testing.T) {
require.NoError(t, err)
// Get local store node address
storeNode, err :=peer.AddrInfoFromString(storeNodeInfo.ListenAddresses[0])
storeNode, err := peer.AddrInfoFromString(storeNodeInfo.ListenAddresses[0])
require.NoError(t, err)
require.NoError(t, err)