88 "crypto/ecdsa"
99 "crypto/rand"
1010 "fmt"
11- "log"
1211 "math/big"
1312 "path/filepath"
1413 "time"
@@ -18,6 +17,7 @@ import (
1817 "github.com/ethereum/go-ethereum/common"
1918 "github.com/ethereum/go-ethereum/crypto"
2019 "github.com/stretchr/testify/require"
20+ "go.uber.org/zap"
2121
2222 "github.com/ava-labs/avalanchego/ids"
2323 "github.com/ava-labs/avalanchego/tests/antithesis"
@@ -31,13 +31,15 @@ import (
3131 "github.com/ava-labs/subnet-evm/tests/utils"
3232
3333 ago_tests "github.com/ava-labs/avalanchego/tests"
34+ "github.com/ava-labs/avalanchego/utils/logging"
3435 timerpkg "github.com/ava-labs/avalanchego/utils/timer"
3536)
3637
3738const NumKeys = 5
3839
3940func main () {
40- tc := ago_tests .NewTestContext ()
41+ logger := ago_tests .NewDefaultLogger ("" )
42+ tc := ago_tests .NewTestContext (logger )
4143 defer tc .Cleanup ()
4244 require := require .New (tc )
4345
@@ -60,7 +62,9 @@ func main() {
6062 ctx := ago_tests .DefaultNotifyContext (c .Duration , tc .DeferCleanup )
6163
6264 require .Len (c .ChainIDs , 1 )
63- log .Printf ("CHAIN IDS: %v" , c .ChainIDs )
65+ logger .Info ("Starting testing" ,
66+ zap .Strings ("chainIDs" , c .ChainIDs ),
67+ )
6468 chainID , err := ids .FromString (c .ChainIDs [0 ])
6569 require .NoError (err , "failed to parse chainID" )
6670
@@ -69,6 +73,7 @@ func main() {
6973 genesisKey := tmpnet .HardhatKey .ToECDSA ()
7074 genesisWorkload := & workload {
7175 id : 0 ,
76+ log : ago_tests .NewDefaultLogger (fmt .Sprintf ("worker %d" , 0 )),
7277 client : genesisClient ,
7378 key : genesisKey ,
7479 uris : c .URIs ,
@@ -82,13 +87,14 @@ func main() {
8287 key , err := crypto .ToECDSA (crypto .Keccak256 ([]byte {uint8 (i )}))
8388 require .NoError (err , "failed to generate key" )
8489
85- require .NoError (transferFunds (ctx , genesisClient , genesisKey , crypto .PubkeyToAddress (key .PublicKey ), initialAmount ))
90+ require .NoError (transferFunds (ctx , genesisClient , genesisKey , crypto .PubkeyToAddress (key .PublicKey ), initialAmount , logger ))
8691
8792 client , err := ethclient .Dial (getChainURI (c .URIs [i % len (c .URIs )], chainID .String ()))
8893 require .NoError (err , "failed to dial chain" )
8994
9095 workloads [i ] = & workload {
9196 id : i ,
97+ log : ago_tests .NewDefaultLogger (fmt .Sprintf ("worker %d" , i )),
9298 client : client ,
9399 key : key ,
94100 uris : c .URIs ,
@@ -109,14 +115,15 @@ func main() {
109115type workload struct {
110116 id int
111117 client ethclient.Client
118+ log logging.Logger
112119 key * ecdsa.PrivateKey
113120 uris []string
114121}
115122
116123func (w * workload ) run (ctx context.Context ) {
117124 timer := timerpkg .StoppedTimer ()
118125
119- tc := ago_tests .NewTestContext ()
126+ tc := ago_tests .NewTestContext (w . log )
120127 defer tc .Cleanup ()
121128 require := require .New (tc )
122129
@@ -132,12 +139,14 @@ func (w *workload) run(ctx context.Context) {
132139 for {
133140 // TODO(marun) Exercise a wider variety of transactions
134141 recipientEthAddress := crypto .PubkeyToAddress (w .key .PublicKey )
135- err := transferFunds (ctx , w .client , w .key , recipientEthAddress , txAmount )
142+ err := transferFunds (ctx , w .client , w .key , recipientEthAddress , txAmount , w . log )
136143 if err != nil {
137144 // Log the error and continue since the problem may be
138145 // transient. require.NoError is only for errors that should stop
139146 // execution.
140- log .Printf ("failed to transfer funds: %s" , err )
147+ w .log .Info ("failed to transfer funds" ,
148+ zap .Error (err ),
149+ )
141150 }
142151
143152 val , err := rand .Int (rand .Reader , big .NewInt (int64 (time .Second )))
@@ -156,7 +165,7 @@ func getChainURI(nodeURI string, blockchainID string) string {
156165 return fmt .Sprintf ("%s/ext/bc/%s/rpc" , nodeURI , blockchainID )
157166}
158167
159- func transferFunds (ctx context.Context , client ethclient.Client , key * ecdsa.PrivateKey , recipientAddress common.Address , txAmount uint64 ) error {
168+ func transferFunds (ctx context.Context , client ethclient.Client , key * ecdsa.PrivateKey , recipientAddress common.Address , txAmount uint64 , log logging. Logger ) error {
160169 chainID , err := client .ChainID (ctx )
161170 if err != nil {
162171 return fmt .Errorf ("failed to fetch chainID: %w" , err )
@@ -188,17 +197,17 @@ func transferFunds(ctx context.Context, client ethclient.Client, key *ecdsa.Priv
188197 return fmt .Errorf ("failed to format transaction: %w" , err )
189198 }
190199
191- log .Printf ("sending transaction with ID %s and nonce %d \n " , tx .Hash (), acceptedNonce )
200+ log .Info ("sending transaction" , zap . Stringer ( "txID" , tx .Hash ()), zap . Uint64 ( "nonce" , acceptedNonce ) )
192201 err = client .SendTransaction (ctx , tx )
193202 if err != nil {
194203 return fmt .Errorf ("failed to send transaction: %w" , err )
195204 }
196205
197- log .Printf ("waiting for acceptance of transaction with ID %s \n " , tx .Hash ())
206+ log .Info ("waiting for acceptance of transaction" , zap . Stringer ( "txID" , tx .Hash () ))
198207 if _ , err := bind .WaitMined (ctx , client , tx ); err != nil {
199208 return fmt .Errorf ("failed to wait for receipt: %v" , err )
200209 }
201- log .Printf ("confirmed acceptance of transaction with ID %s \n " , tx .Hash ())
210+ log .Info ("confirmed acceptance of transaction" , zap . Stringer ( "txID" , tx .Hash () ))
202211
203212 return nil
204213}
0 commit comments