chore: clean up

Author: jadepark-dev

framework/components/blockchain/blockchain.go

@@ -55,8 +55,8 @@ type Input struct {
 	ContainerResources *framework.ContainerResources `toml:"resources"`
 	CustomPorts        []string                      `toml:"custom_ports"`
 
-	// Ton
-	CoreServices []string `toml:"core_services"`
+	// Ton - MyLocalTon essesntial services to run tests
+	TonCoreServices []string `toml:"ton_core_services"`
 }
 
 // Output is a blockchain network output, ChainID and one or more nodes that forms the network

framework/components/blockchain/ton.go

@@ -31,10 +31,13 @@ const (
 
 func defaultTon(in *Input) {
 	if in.Image == "" {
-		// Note: mylocalton is a compose file, not a single image. Reusing common image field
+		// Note: mylocalton uses a compose file, not a single image. Reusing common image field
 		in.Image = "https://raw.githubusercontent.com/neodix42/mylocalton-docker/main/docker-compose.yaml"
+	}
+	// Note: in local env having all services could be useful(explorer, faucet), in CI we need only core services
+	if os.Getenv("CI") == "true" && len(in.TonCoreServices) == 0 {
 		// Note: mylocalton-docker's essential services, excluded explorer, restarter, faucet app,
-		in.CoreServices = []string{
+		in.TonCoreServices = []string{
 			"genesis", "tonhttpapi", "event-cache",
 			"index-postgres", "index-worker", "index-api",
 		}
@@ -87,14 +90,9 @@ func newTon(in *Input) (*Output, error) {
 
 	var upOpts []compose.StackUpOption
 	upOpts = append(upOpts, compose.Wait(true))
-	services := []string{}
-	// Note: in local env having all services could be useful(explorer, faucet), in CI we need only core services
-	if os.Getenv("CI") == "true" && len(services) == 0 {
-		services = in.CoreServices
-	}
 
-	if len(services) > 0 {
-		upOpts = append(upOpts, compose.RunServices(services...))
+	if len(in.TonCoreServices) > 0 {
+		upOpts = append(upOpts, compose.RunServices(in.TonCoreServices...))
 	}
 
 	// always wait for healthy
@@ -133,7 +131,7 @@ func newTon(in *Input) (*Output, error) {
 		ContainerName: containerName,
 		// Note: in case we need 1+ validators, we need to modify the compose file
 		Nodes: []*Node{{
-			// todo: define if we need more access other than lite client(tonutils-go only needs lite client)
+			// Note: define if we need more access other than lite client(tonutils-go only needs lite client)
 			ExternalHTTPUrl: fmt.Sprintf("%s:%s", liteHost, litePort.Port()),
 		}},
 		NetworkSpecificData: &NetworkSpecificData{

framework/examples/myproject/smoke_ton.toml

@@ -1,7 +1,7 @@
 [blockchain_a]
 type = "ton"
 image = "https://raw.githubusercontent.com/neodix42/mylocalton-docker/main/docker-compose.yaml"
-core_services = [
+ton_core_services = [
   "genesis",
   "tonhttpapi",
   "event-cache",

framework/examples/myproject/smoke_ton_test.go

@@ -24,7 +24,7 @@ func TestTonSmoke(t *testing.T) {
 	bc, err := blockchain.NewBlockchainNetwork(in.BlockchainA)
 	require.NoError(t, err)
 
-	var client *ton.APIClient
+	var client ton.APIClientWrapped
 
 	t.Run("setup:connect", func(t *testing.T) {
 		connectionPool := liteclient.NewConnectionPool()
@@ -33,7 +33,7 @@ func TestTonSmoke(t *testing.T) {
 		require.NoError(t, cferr, "Failed to get config from URL")
 		caerr := connectionPool.AddConnectionsFromConfig(t.Context(), cfg)
 		require.NoError(t, caerr, "Failed to add connections from config")
-		client = ton.NewAPIClient(connectionPool)
+		client = ton.NewAPIClient(connectionPool).WithRetry()
 
 		t.Run("setup:faucet", func(t *testing.T) {
 			// network is already funded
@@ -43,12 +43,14 @@ func TestTonSmoke(t *testing.T) {
 			require.NoError(t, err, "failed to create highload wallet")
 			funder, err := mcFunderWallet.GetSubwallet(uint32(42))
 			require.NoError(t, err, "failed to get highload subwallet")
+
+			// double check funder address
 			require.Equal(t, funder.Address().StringRaw(), blockchain.DefaultTonHlWalletAddress, "funder address mismatch")
 
+			// check funder balance
 			master, err := client.GetMasterchainInfo(t.Context())
 			require.NoError(t, err, "failed to get masterchain info for funder balance check")
 			funderBalance, err := funder.GetBalance(t.Context(), master)
-			t.Log("Funder balance: ", funderBalance)
 			require.NoError(t, err, "failed to get funder balance")
 			require.Equal(t, funderBalance.Nano().String(), "1000000000000000", "funder balance mismatch")
 		})