Revert "Supernode Selfreport"

.vscode/launch.json

@@ -24,19 +24,6 @@
             "env": {},
             "showLog": true,
             "trace": "verbose"
-        },
-        {
-            "name": "Cascade E2E (test-cascade)",
-            "type": "go",
-            "request": "launch",
-            "mode": "test",
-            "program": "${workspaceFolder}/tests/system",
-            "cwd": "${workspaceFolder}/tests/system",
-            "args": ["-test.run", "TestCascadeE2E", "-test.v"],
-            "buildFlags": "-tags=system_test",
-            "env": {},
-            "showLog": true,
-            "trace": "verbose"
-        }
+        },        
     ]
-}
+}

go.mod

@@ -60,7 +60,6 @@ require (
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
 	github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
-	github.com/Masterminds/semver/v3 v3.3.1 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect

go.sum

@@ -80,8 +80,6 @@ github.com/LumeraProtocol/lumera v1.8.6-rc2 h1:o4f3HOpmpk6VU+PiFOExx6F6doffLCKJU
 github.com/LumeraProtocol/lumera v1.8.6-rc2/go.mod h1:DcG+PermGhl5uA51VaSA0EC+FXpDVm2XgifmYL9jJvE=
 github.com/LumeraProtocol/rq-go v0.2.1 h1:8B3UzRChLsGMmvZ+UVbJsJj6JZzL9P9iYxbdUwGsQI4=
 github.com/LumeraProtocol/rq-go v0.2.1/go.mod h1:APnKCZRh1Es2Vtrd2w4kCLgAyaL5Bqrkz/BURoRJ+O8=
-github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
-github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=

p2p/kademlia/dht.go

@@ -2114,12 +2114,6 @@ func (s *DHT) IterateBatchStore(ctx context.Context, values [][]byte, typ int, i
 	knownNodes := make(map[string]*Node)
 	hashes := make([][]byte, len(values))
 
-	// In integration tests we want to exercise the Cascade pipeline and local
-	// storage without depending on a fully healthy DHT graph. If we cannot
-	// find any candidate peers to send store RPCs to, we treat this as a
-	// no-op success instead of failing the whole operation.
-	isIntegrationTest := os.Getenv("INTEGRATION_TEST") == "true"
-
 	{
 		f := logtrace.Fields{logtrace.FieldModule: "dht", "task_id": id, "keys": len(values), "len_nodes": len(s.ht.nodes()), logtrace.FieldRole: "client"}
 		if o := logtrace.OriginFromContext(ctx); o != "" {
@@ -2149,18 +2143,6 @@ func (s *DHT) IterateBatchStore(ctx context.Context, values [][]byte, typ int, i
 	successful := 0
 
 	logtrace.Debug(ctx, "Iterate batch store: dispatching to nodes", logtrace.Fields{"task_id": id, "nodes": len(knownNodes)})
-
-	// If there are no candidate nodes and we're running under the integration
-	// test harness, skip the network fan-out and report success so higher
-	// layers (Cascade tests) can proceed.
-	if len(knownNodes) == 0 && isIntegrationTest {
-		logtrace.Info(ctx, "dht: batch store skipped (no candidate nodes in integration test)", logtrace.Fields{
-			logtrace.FieldModule: "dht",
-			"task_id":            id,
-			"keys":               len(values),
-		})
-		return nil
-	}
 	storeResponses := s.batchStoreNetwork(ctx, values, knownNodes, storageMap, typ)
 	for response := range storeResponses {
 		requests++

pkg/lumera/client.go

@@ -10,21 +10,19 @@ import (
 	"github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/bank"
 	"github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/node"
 	"github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/supernode"
-	"github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/supernode_msg"
 	"github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/tx"
 )
 
 type lumeraClient struct {
-	cfg             *Config
-	authMod         auth.Module
-	actionMod       action.Module
-	actionMsgMod    action_msg.Module
-	bankMod         bank.Module
-	supernodeMod    supernode.Module
-	supernodeMsgMod supernode_msg.Module
-	txMod           tx.Module
-	nodeMod         node.Module
-	conn            Connection
+	cfg          *Config
+	authMod      auth.Module
+	actionMod    action.Module
+	actionMsgMod action_msg.Module
+	bankMod      bank.Module
+	supernodeMod supernode.Module
+	txMod        tx.Module
+	nodeMod      node.Module
+	conn         Connection
 }
 
 func newClient(ctx context.Context, cfg *Config) (Client, error) {
@@ -95,31 +93,16 @@ func newClient(ctx context.Context, cfg *Config) (Client, error) {
 		return nil, err
 	}
 
-	supernodeMsgModule, err := supernode_msg.NewModule(
-		conn.GetConn(),
-		authModule,
-		txModule,
-		supernodeModule,
-		cfg.keyring,
-		cfg.KeyName,
-		cfg.ChainID,
-	)
-	if err != nil {
-		conn.Close()
-		return nil, err
-	}
-
 	return &lumeraClient{
-		cfg:             cfg,
-		authMod:         authModule,
-		actionMod:       actionModule,
-		actionMsgMod:    actionMsgModule,
-		bankMod:         bankModule,
-		supernodeMod:    supernodeModule,
-		supernodeMsgMod: supernodeMsgModule,
-		txMod:           txModule,
-		nodeMod:         nodeModule,
-		conn:            conn,
+		cfg:          cfg,
+		authMod:      authModule,
+		actionMod:    actionModule,
+		actionMsgMod: actionMsgModule,
+		bankMod:      bankModule,
+		supernodeMod: supernodeModule,
+		txMod:        txModule,
+		nodeMod:      nodeModule,
+		conn:         conn,
 	}, nil
 }
 
@@ -143,10 +126,6 @@ func (c *lumeraClient) SuperNode() supernode.Module {
 	return c.supernodeMod
 }
 
-func (c *lumeraClient) SuperNodeMsg() supernode_msg.Module {
-	return c.supernodeMsgMod
-}
-
 func (c *lumeraClient) Tx() tx.Module {
 	return c.txMod
 }

pkg/lumera/codec/encoding.go

@@ -4,7 +4,6 @@ import (
 	"sync"
 
 	actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types"
-	sntypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -50,7 +49,7 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 	cryptocodec.RegisterInterfaces(registry)
 	authtypes.RegisterInterfaces(registry)
 	actiontypes.RegisterInterfaces(registry)
-	sntypes.RegisterInterfaces(registry)
+	// Add more interface registrations here as you add more modules
 }
 
 // GetEncodingConfig returns the standard encoding config for Lumera client

pkg/lumera/interface.go

@@ -10,7 +10,6 @@ import (
 	"github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/bank"
 	"github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/node"
 	"github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/supernode"
-	"github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/supernode_msg"
 	"github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/tx"
 )
 
@@ -20,7 +19,6 @@ type Client interface {
 	Action() action.Module
 	ActionMsg() action_msg.Module
 	SuperNode() supernode.Module
-	SuperNodeMsg() supernode_msg.Module
 	Bank() bank.Module
 	Tx() tx.Module
 	Node() node.Module