-
Notifications
You must be signed in to change notification settings - Fork 671
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
X-chain - consolidate tx creation in unit tests #2736
Changes from all commits
1adc328
f6d7382
3889e51
e725961
30a4343
add3a35
3d08216
8f35564
2b16538
4751e79
e00d7c9
b454987
f832034
d33a6a2
8a89505
3daec34
a0020b1
f28b80b
26fcb79
1feae9a
39cae3c
199424b
7c04d76
40e480a
03c0a9f
cb0a693
625817e
1f95de4
5ea9c0b
dcdf22c
2b05cf1
9a6795b
9b97764
6315ae0
a4b81e6
392e935
d3a733e
0db8e79
a8d8111
c6fa18c
1d61776
d975933
57f5b22
60277cd
68f5cb7
10a2c74
9351da1
8e45dd9
8bc9160
8d74f21
929dfab
0be7156
e59213b
2492f5e
54a7f4b
48087b1
ae9e074
11d1ec8
80b4464
a1e71bb
1e9348f
2fd9017
b33d825
eb41fdb
f0b3c69
8420192
54d3440
1711699
0cd1353
78b6460
31b691a
1a8490c
a98e9b1
59a1e07
40ef4fa
5782a14
f2d8c8c
688592d
1e73a95
65f77e4
18e6293
5d69721
8037af7
1d4353d
bb07c56
892a043
0628635
f7786e8
0365a16
917fada
5667ace
c2165c2
7088342
34cf1ee
ebb56c1
a529c11
c7d9274
1bd4b3a
9000228
309a42e
a3d31b5
136edf5
43d3776
c2ec02c
8dfbf73
249cd6b
3aba33c
3fea872
2894f7c
0758ec0
1fc7105
86f2558
808d680
4dd1890
0073de6
a37652c
d80d282
796e31a
0134d7d
ecfbd6a
37440f4
35dd485
c46c132
ba8f805
71c0202
06628d6
adb9c2d
f7af3c1
10db896
bee94af
21550da
2020d1c
9d4e0d4
9b31b05
3013fb1
003fa79
8880e77
b6d1869
350725e
768cbf5
f73ea9d
de87fd6
c0f0a3a
760fbf8
870361a
8b4779d
3b65160
29f7af7
fc07c85
966e472
becfdbd
1d17690
1e8def5
aab2739
c5ea3e1
cbe35fa
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,14 +24,14 @@ import ( | |
"github.com/ava-labs/avalanchego/utils/crypto/secp256k1" | ||
"github.com/ava-labs/avalanchego/utils/formatting" | ||
"github.com/ava-labs/avalanchego/utils/formatting/address" | ||
"github.com/ava-labs/avalanchego/utils/linked" | ||
"github.com/ava-labs/avalanchego/utils/logging" | ||
"github.com/ava-labs/avalanchego/utils/sampler" | ||
"github.com/ava-labs/avalanchego/utils/timer/mockable" | ||
"github.com/ava-labs/avalanchego/vms/avm/block/executor" | ||
"github.com/ava-labs/avalanchego/vms/avm/config" | ||
"github.com/ava-labs/avalanchego/vms/avm/fxs" | ||
"github.com/ava-labs/avalanchego/vms/avm/txs" | ||
"github.com/ava-labs/avalanchego/vms/avm/txs/txstest" | ||
"github.com/ava-labs/avalanchego/vms/components/avax" | ||
"github.com/ava-labs/avalanchego/vms/nftfx" | ||
"github.com/ava-labs/avalanchego/vms/secp256k1fx" | ||
|
@@ -77,12 +77,6 @@ var ( | |
|
||
keys = secp256k1.TestKeys()[:3] // TODO: Remove [:3] | ||
addrs []ids.ShortID // addrs[i] corresponds to keys[i] | ||
|
||
noFeesTestConfig = &config.Config{ | ||
EUpgradeTime: mockable.MaxTime, | ||
TxFee: 0, | ||
CreateAssetTxFee: 0, | ||
} | ||
) | ||
|
||
func init() { | ||
|
@@ -110,13 +104,12 @@ type envConfig struct { | |
} | ||
|
||
type environment struct { | ||
genesisBytes []byte | ||
genesisTx *txs.Tx | ||
sharedMemory *atomic.Memory | ||
issuer chan common.Message | ||
vm *VM | ||
service *Service | ||
walletService *WalletService | ||
Comment on lines
-118
to
-119
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. dropped service and walletService. Using txBuilder to create txs instead. |
||
genesisBytes []byte | ||
genesisTx *txs.Tx | ||
sharedMemory *atomic.Memory | ||
issuer chan common.Message | ||
vm *VM | ||
txBuilder *txstest.Builder | ||
} | ||
|
||
// setup the testing environment | ||
|
@@ -210,13 +203,7 @@ func setup(tb testing.TB, c *envConfig) *environment { | |
sharedMemory: m, | ||
issuer: issuer, | ||
vm: vm, | ||
service: &Service{ | ||
vm: vm, | ||
}, | ||
walletService: &WalletService{ | ||
vm: vm, | ||
pendingTxs: linked.NewHashmap[ids.ID, *txs.Tx](), | ||
}, | ||
txBuilder: txstest.New(vm.parser.Codec(), vm.ctx, &vm.Config, vm.feeAssetID, vm.state), | ||
} | ||
|
||
require.NoError(vm.SetState(context.Background(), snow.Bootstrapping)) | ||
|
@@ -230,6 +217,14 @@ func setup(tb testing.TB, c *envConfig) *environment { | |
} | ||
|
||
require.NoError(vm.SetState(context.Background(), snow.NormalOp)) | ||
|
||
tb.Cleanup(func() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. lock is acquired above. Each UT using setup is expected to eventually Unlock to that tb.Cleanup works properly |
||
env.vm.ctx.Lock.Lock() | ||
defer env.vm.ctx.Lock.Unlock() | ||
|
||
require.NoError(env.vm.Shutdown(context.Background())) | ||
}) | ||
|
||
return env | ||
} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
one of the key point of this PR: no more zero fees config. With the E upgrade we won't have zero fees anymore