Skip to content

Commit 20e9017

Browse files
committed
ton local fixes
1 parent d093862 commit 20e9017

File tree

1 file changed

+6
-16
lines changed
  • framework/components/blockchain

1 file changed

+6
-16
lines changed

framework/components/blockchain/ton.go

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
"github.com/docker/docker/api/types/container"
1010
"github.com/testcontainers/testcontainers-go"
11-
"github.com/testcontainers/testcontainers-go/network"
1211
"github.com/testcontainers/testcontainers-go/wait"
1312

1413
"github.com/smartcontractkit/chainlink-testing-framework/framework"
@@ -21,7 +20,6 @@ const (
2120
DefaultTonHlWalletMnemonic = "twenty unfair stay entry during please water april fabric morning length lumber style tomorrow melody similar forum width ride render void rather custom coin"
2221
// internals
2322
defaultTonHTTPServerPort = "8000"
24-
defaultLiteServerPort = "40000"
2523
defaultLiteServerPublicKey = "E7XwFSQzNkcRepUC23J2nRpASXpnsEKmyyHYV4u/FZY="
2624
liteServerPortOffset = 100 // arbitrary offset for lite server port
2725
)
@@ -53,22 +51,13 @@ func newTon(ctx context.Context, in *Input) (*Output, error) {
5351
LiteServer: strconv.Itoa(base + liteServerPortOffset),
5452
}
5553

56-
network, err := network.New(ctx,
57-
network.WithAttachable(),
58-
network.WithLabels(framework.DefaultTCLabels()),
59-
)
60-
if err != nil {
61-
return nil, err
62-
}
63-
networkName := network.Name
64-
6554
baseEnv := map[string]string{
6655
"GENESIS": "true",
6756
"NAME": "genesis",
6857

6958
"EMBEDDED_FILE_HTTP_SERVER": "true",
70-
"EMBEDDED_FILE_HTTP_SERVER_PORT": defaultTonHTTPServerPort,
71-
"LITE_PORT": defaultLiteServerPort,
59+
"EMBEDDED_FILE_HTTP_SERVER_PORT": ports.HTTPServer,
60+
"LITE_PORT": ports.LiteServer,
7261

7362
"CUSTOM_PARAMETERS": "--state-ttl 315360000 --archive-ttl 315360000",
7463
}
@@ -80,14 +69,15 @@ func newTon(ctx context.Context, in *Input) (*Output, error) {
8069
finalEnv[key] = value
8170
}
8271
}
72+
networkName := framework.DefaultNetworkName
8373

8474
req := testcontainers.ContainerRequest{
8575
Image: in.Image,
8676
AlwaysPullImage: in.PullImage,
8777
Name: framework.DefaultTCName("ton-genesis"),
8878
ExposedPorts: []string{
89-
fmt.Sprintf("%s:%s/tcp", ports.HTTPServer, defaultTonHTTPServerPort),
90-
fmt.Sprintf("%s:%s/tcp", ports.LiteServer, defaultLiteServerPort),
79+
fmt.Sprintf("%s:%s/tcp", ports.HTTPServer, ports.HTTPServer),
80+
fmt.Sprintf("%s:%s/tcp", ports.LiteServer, ports.LiteServer),
9181
"40003/udp",
9282
"40002/tcp",
9383
"40001/udp",
@@ -98,7 +88,7 @@ func newTon(ctx context.Context, in *Input) (*Output, error) {
9888
Env: finalEnv,
9989
WaitingFor: wait.ForExec([]string{
10090
"/usr/local/bin/lite-client",
101-
"-a", fmt.Sprintf("127.0.0.1:%s", defaultLiteServerPort),
91+
"-a", fmt.Sprintf("127.0.0.1:%s", ports.LiteServer),
10292
"-b", defaultLiteServerPublicKey,
10393
"-t", "3", "-c", "last",
10494
}).WithStartupTimeout(2 * time.Minute),

0 commit comments

Comments
 (0)