feat: remove redundant code. rework block response. remove ctx redund…

…ancy checker

testkit/appkit/app.go

@@ -106,33 +106,33 @@ func (ak *AppKit) PayForData(accAdr string, msg int, krbackend, chainId, home st
 	ak.Cmd.SetArgs([]string{
 		"tx", "payment", "payForData", fmt.Sprint(msg),
 		"--from", accAdr, "-b", "block", "-y", "--gas", "1000000000",
-		"--fees", "100000000000utia", //15
+		"--fees", "100000000000utia",
 		"--keyring-backend", krbackend, "--chain-id", chainId, "--home", home, "--keyring-dir", home,
 	})
 
 	return svrcmd.Execute(ak.Cmd, appcmd.EnvPrefix, app.DefaultNodeHome)
 }
 
-func getResultBlockResponse(uri string) (coretypes.ResultBlock, error) {
+func getResultBlockResponse(uri string) (*coretypes.ResultBlock, error) {
 	resp, err := http.Get(uri)
 	if err != nil {
-		return coretypes.ResultBlock{}, err
+		return nil, err
 	}
 	defer resp.Body.Close()
 
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return coretypes.ResultBlock{}, err
+		return nil, err
 	}
 
 	var rpcResponse types.RPCResponse
 	if err := rpcResponse.UnmarshalJSON(body); err != nil {
-		return coretypes.ResultBlock{}, err
+		return nil, err
 	}
 
-	var resBlock coretypes.ResultBlock
+	var resBlock *coretypes.ResultBlock
 	if err := tmjson.Unmarshal(rpcResponse.Result, &resBlock); err != nil {
-		return coretypes.ResultBlock{}, err
+		return nil, err
 	}
 
 	return resBlock, nil
@@ -182,9 +182,12 @@ func updateConfig(path, key string, value interface{}) error {
 }
 
 func AddSeedPeers(path string, peers []string) error {
-	var peersStr bytes.Buffer
-	var port int = 26656
-	var separator string = ","
+	var (
+		peersStr  bytes.Buffer
+		port      int    = 26656
+		separator string = ","
+	)
+
 	for k, peer := range peers {
 		if k == (len(peers) - 1) {
 			separator = ""

testkit/sync.go

@@ -43,5 +43,4 @@ var (
 	AppStartedState    = sync.State("app-started")
 	BridgeStartedState = sync.State("bridge-started")
 	FinishState        = sync.State("test-finished")
-	FinalGenesisState  = sync.State("final-genesis")
 )

tests/app-sync/run_seeds.go

@@ -31,7 +31,6 @@ func RunSeed(runenv *runtime.RunEnv, initCtx *run.InitContext) error {
 		Network: "default",
 		Enable:  true,
 		Default: network.LinkShape{
-			// Latency:   100 * time.Millisecond,
 			Bandwidth: 4 << 26, // 256Mib
 		},
 		CallbackState: "network-configured",
@@ -61,11 +60,6 @@ func RunSeed(runenv *runtime.RunEnv, initCtx *run.InitContext) error {
 		return err
 	}
 
-	err = <-syncclient.MustBarrier(ctx, testkit.FinalGenesisState, 1).C
-	if err != nil {
-		return err
-	}
-
 	initGenCh := make(chan string)
 	sub, err := syncclient.Subscribe(ctx, testkit.InitialGenenesisTopic, initGenCh)
 	if err != nil {
@@ -104,10 +98,9 @@ func RunSeed(runenv *runtime.RunEnv, initCtx *run.InitContext) error {
 	go cmd.StartNode(home, "info")
 
 	// // wait for a new block to be produced
-	time.Sleep(10 * time.Minute)
+	time.Sleep(1 * time.Minute)
 
 	runenv.RecordSuccess()
-	// }
 
 	return nil
 }

tests/app-sync/run_validators.go

@@ -31,10 +31,7 @@ func RunValidator(runenv *runtime.RunEnv, initCtx *run.InitContext) error {
 		Network: "default",
 		Enable:  true,
 		Default: network.LinkShape{
-			// Latency: 100 * time.Millisecond,
-			// Bandwidth: 4 << 26, // 256Mib
 			Bandwidth: 5 << 26, // 320Mib
-			// Bandwidth: 4 << 27, // 512Mib
 		},
 		CallbackState: "network-configured",
 		RoutingPolicy: network.AllowAll,

tests/node-sync/run_bridge.go

@@ -14,6 +14,7 @@ import (
 	"github.com/testground/sdk-go/network"
 	"github.com/testground/sdk-go/run"
 	"github.com/testground/sdk-go/runtime"
+	"github.com/testground/sdk-go/sync"
 )
 
 func RunBridgeNode(runenv *runtime.RunEnv, initCtx *run.InitContext) error {
@@ -156,3 +157,27 @@ func RunBridgeNode(runenv *runtime.RunEnv, initCtx *run.InitContext) error {
 
 	return nil
 }
+
+func GetBridgeNode(ctx context.Context, syncclient sync.Client, id int64, amountOfBridges int) (*testkit.BridgeNodeInfo, error) {
+	bridgeCh := make(chan *testkit.BridgeNodeInfo, amountOfBridges)
+	sub, err := syncclient.Subscribe(ctx, testkit.BridgeNodeTopic, bridgeCh)
+	if err != nil {
+		return nil, err
+	}
+
+	for {
+		select {
+		case err = <-sub.Done():
+			if err != nil {
+				return nil,
+					fmt.Errorf("no bridge address has been sent to this light node to connect to")
+			}
+		case bridge := <-bridgeCh:
+			fmt.Printf("Received Bridge ID = %d", bridge.ID)
+			if (int(id) % amountOfBridges) == (bridge.ID % amountOfBridges) {
+				return bridge, nil
+			}
+		}
+	}
+
+}

tests/node-sync/run_full.go

@@ -51,31 +51,7 @@ func RunFullNode(runenv *runtime.RunEnv, initCtx *run.InitContext) error {
 		return err
 	}
 
-	bridgeCh := make(chan *testkit.BridgeNodeInfo, runenv.IntParam("bridge"))
-	sub, err := syncclient.Subscribe(ctx, testkit.BridgeNodeTopic, bridgeCh)
-	if err != nil {
-		return err
-	}
-
-	bridgeNode, err := func(total int) (*testkit.BridgeNodeInfo, error) {
-		for {
-			select {
-			case err = <-sub.Done():
-				if err != nil {
-					return nil, err
-				}
-			case <-ctx.Done():
-				return nil,
-					fmt.Errorf("no bridge address has been sent to this light node to connect to")
-			case bridge := <-bridgeCh:
-				runenv.RecordMessage("Received Bridge ID = %d", bridge.ID)
-				if (int(initCtx.GlobalSeq) % total) == (bridge.ID % total) {
-					return bridge, nil
-				}
-			}
-		}
-	}(runenv.IntParam("bridge"))
-
+	bridgeNode, err := GetBridgeNode(ctx, syncclient, initCtx.GlobalSeq, runenv.IntParam("bridge"))
 	if err != nil {
 		return err
 	}

tests/node-sync/run_light.go

@@ -51,31 +51,7 @@ func RunLightNode(runenv *runtime.RunEnv, initCtx *run.InitContext) error {
 		return err
 	}
 
-	bridgeCh := make(chan *testkit.BridgeNodeInfo, runenv.IntParam("bridge")) //4
-	sub, err := syncclient.Subscribe(ctx, testkit.BridgeNodeTopic, bridgeCh)
-	if err != nil {
-		return err
-	}
-
-	bridgeNode, err := func(total int) (*testkit.BridgeNodeInfo, error) {
-		for {
-			select {
-			case err = <-sub.Done():
-				if err != nil {
-					return nil, err
-				}
-			case <-ctx.Done():
-				return nil,
-					fmt.Errorf("no bridge address has been sent to this light node to connect to")
-			case bridge := <-bridgeCh:
-				runenv.RecordMessage("Received Bridge ID = %d", bridge.ID)
-				if (int(initCtx.GlobalSeq) % total) == (bridge.ID % total) {
-					return bridge, nil
-				}
-			}
-		}
-	}(runenv.IntParam("bridge"))
-
+	bridgeNode, err := GetBridgeNode(ctx, syncclient, initCtx.GlobalSeq, runenv.IntParam("bridge"))
 	if err != nil {
 		return err
 	}
@@ -109,7 +85,6 @@ func RunLightNode(runenv *runtime.RunEnv, initCtx *run.InitContext) error {
 	}
 
 	runenv.RecordMessage("Reached Block#6 contains Hash: %s", eh.Commit.BlockID.Hash.String())
-	runenv.RecordSuccess()
 
 	err = nd.Stop(ctx)
 	if err != nil {