Skip to content

Commit 08d9ced

Browse files
jxomjxom
authored
test(tempo): align e2e + dex tests with latest tempo node behavior (#4563)
* test(tempo): align e2e + dex tests with latest tempo node behavior - e2e.test.ts: drop blockTimestamp assertions on the non-tempo sendTransaction default test; older node deployments (e.g. testnet) do not return blockTimestamp for eip1559 transactions. - dex.test.ts: TIP-1030 (T5+) allows flipTick == tick for placeFlip, so update the bid/ask flipTick tests to assert the relaxed >= / <= constraint. Amp-Thread-ID: https://ampcode.com/threads/T-019de09d-1acb-712d-80cf-af2e298e0893 * test(tempo): drop blockTimestamp e2e assertions The deployed testnet does not return blockTimestamp on transactions yet, so the assertions added in #4561 fail there. blockTimestamp formatting is already covered by chainConfig.test.ts (localnet). Amp-Thread-ID: https://ampcode.com/threads/T-019de09d-1acb-712d-80cf-af2e298e0893
1 parent e1d2ffd commit 08d9ced

2 files changed

Lines changed: 38 additions & 70 deletions

File tree

‎src/tempo/actions/dex.test.ts‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ describe('placeFlip', () => {
11391139
`)
11401140
})
11411141

1142-
test('behavior: flip bid requires flipTick > tick', async () => {
1142+
test('behavior: flip bid requires flipTick >= tick', async () => {
11431143
const { base } = await setupTokenPair(client)
11441144

11451145
// Valid: flipTick > tick for bid
@@ -1152,17 +1152,17 @@ describe('placeFlip', () => {
11521152
})
11531153
expect(receipt1.status).toBe('success')
11541154

1155-
// Invalid: flipTick <= tick for bid should fail
1156-
await expect(
1157-
Actions.dex.placeFlipSync(client, {
1158-
token: base,
1159-
amount: parseUnits('100', 6),
1160-
type: 'buy',
1161-
tick: Tick.fromPrice('1.001'),
1162-
flipTick: Tick.fromPrice('1.001'), // Equal
1163-
}),
1164-
).rejects.toThrow('The contract function "placeFlip" reverted')
1155+
// Valid (T5+, TIP-1030): flipTick == tick for bid
1156+
const { receipt: receipt2 } = await Actions.dex.placeFlipSync(client, {
1157+
token: base,
1158+
amount: parseUnits('100', 6),
1159+
type: 'buy',
1160+
tick: Tick.fromPrice('1.001'),
1161+
flipTick: Tick.fromPrice('1.001'), // Equal
1162+
})
1163+
expect(receipt2.status).toBe('success')
11651164

1165+
// Invalid: flipTick < tick for bid should fail
11661166
await expect(
11671167
Actions.dex.placeFlipSync(client, {
11681168
token: base,
@@ -1174,7 +1174,7 @@ describe('placeFlip', () => {
11741174
).rejects.toThrow('The contract function "placeFlip" reverted')
11751175
})
11761176

1177-
test('behavior: flip ask requires flipTick < tick', async () => {
1177+
test('behavior: flip ask requires flipTick <= tick', async () => {
11781178
const { base } = await setupTokenPair(client)
11791179

11801180
// Valid: flipTick < tick for ask
@@ -1187,17 +1187,17 @@ describe('placeFlip', () => {
11871187
})
11881188
expect(receipt1.status).toBe('success')
11891189

1190-
// Invalid: flipTick >= tick for ask should fail
1191-
await expect(
1192-
Actions.dex.placeFlipSync(client, {
1193-
token: base,
1194-
amount: parseUnits('100', 6),
1195-
type: 'sell',
1196-
tick: Tick.fromPrice('1.0005'),
1197-
flipTick: Tick.fromPrice('1.0005'), // Equal
1198-
}),
1199-
).rejects.toThrow('The contract function "placeFlip" reverted')
1190+
// Valid (T5+, TIP-1030): flipTick == tick for ask
1191+
const { receipt: receipt2 } = await Actions.dex.placeFlipSync(client, {
1192+
token: base,
1193+
amount: parseUnits('100', 6),
1194+
type: 'sell',
1195+
tick: Tick.fromPrice('1.0005'),
1196+
flipTick: Tick.fromPrice('1.0005'), // Equal
1197+
})
1198+
expect(receipt2.status).toBe('success')
12001199

1200+
// Invalid: flipTick > tick for ask should fail
12011201
await expect(
12021202
Actions.dex.placeFlipSync(client, {
12031203
token: base,

‎src/tempo/e2e.test.ts‎

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe('sendTransaction', () => {
5252
const {
5353
blockHash,
5454
blockNumber,
55-
blockTimestamp,
55+
blockTimestamp: _blockTimestamp,
5656
chainId,
5757
from,
5858
gas,
@@ -72,8 +72,6 @@ describe('sendTransaction', () => {
7272

7373
expect(blockHash).toBeDefined()
7474
expect(blockNumber).toBeDefined()
75-
expect(blockTimestamp).toBeTypeOf('bigint')
76-
expect(blockTimestamp).toBeGreaterThan(0n)
7775
expect(chainId).toBeDefined()
7876
expect(from).toBe(account.address.toLowerCase())
7977
expect(gas).toBeDefined()
@@ -113,7 +111,7 @@ describe('sendTransaction', () => {
113111
const {
114112
blockHash,
115113
blockNumber,
116-
blockTimestamp,
114+
blockTimestamp: _blockTimestamp,
117115
chainId,
118116
feeToken: feeToken_,
119117
from,
@@ -133,8 +131,6 @@ describe('sendTransaction', () => {
133131

134132
expect(blockHash).toBeDefined()
135133
expect(blockNumber).toBeDefined()
136-
expect(blockTimestamp).toBeTypeOf('bigint')
137-
expect(blockTimestamp).toBeGreaterThan(0n)
138134
expect(chainId).toBeDefined()
139135
expect(feeToken_).toBe(feeToken)
140136
expect(from).toBe(account.address.toLowerCase())
@@ -190,7 +186,7 @@ describe('sendTransaction', () => {
190186
const {
191187
blockHash,
192188
blockNumber,
193-
blockTimestamp,
189+
blockTimestamp: _blockTimestamp,
194190
chainId,
195191
feeToken: feeToken_,
196192
from,
@@ -210,8 +206,6 @@ describe('sendTransaction', () => {
210206

211207
expect(blockHash).toBeDefined()
212208
expect(blockNumber).toBeDefined()
213-
expect(blockTimestamp).toBeTypeOf('bigint')
214-
expect(blockTimestamp).toBeGreaterThan(0n)
215209
expect(chainId).toBeDefined()
216210
expect(feeToken_).toBe(feeToken)
217211
expect(from).toBe(accounts[0].address.toLowerCase())
@@ -269,7 +263,7 @@ describe('sendTransaction', () => {
269263
const {
270264
blockHash,
271265
blockNumber,
272-
blockTimestamp,
266+
blockTimestamp: _blockTimestamp,
273267
calls,
274268
chainId,
275269
feeToken: ___,
@@ -290,8 +284,6 @@ describe('sendTransaction', () => {
290284

291285
expect(blockHash).toBeDefined()
292286
expect(blockNumber).toBeDefined()
293-
expect(blockTimestamp).toBeTypeOf('bigint')
294-
expect(blockTimestamp).toBeGreaterThan(0n)
295287
expect(calls?.length).toBe(1)
296288
expect(chainId).toBeDefined()
297289
expect(from).toBe(account.address.toLowerCase())
@@ -337,7 +329,7 @@ describe('sendTransaction', () => {
337329
const {
338330
blockHash,
339331
blockNumber,
340-
blockTimestamp,
332+
blockTimestamp: _blockTimestamp,
341333
chainId,
342334
feePayerSignature,
343335
feeToken: ___,
@@ -358,8 +350,6 @@ describe('sendTransaction', () => {
358350

359351
expect(blockHash).toBeDefined()
360352
expect(blockNumber).toBeDefined()
361-
expect(blockTimestamp).toBeTypeOf('bigint')
362-
expect(blockTimestamp).toBeGreaterThan(0n)
363353
expect(chainId).toBeDefined()
364354
expect(feePayerSignature).toBeDefined()
365355
expect(from).toBe(account.address.toLowerCase())
@@ -474,7 +464,7 @@ describe('sendTransaction', () => {
474464
const {
475465
blockHash,
476466
blockNumber,
477-
blockTimestamp,
467+
blockTimestamp: _blockTimestamp,
478468
chainId,
479469
feeToken: ___,
480470
from,
@@ -496,8 +486,6 @@ describe('sendTransaction', () => {
496486

497487
expect(blockHash).toBeDefined()
498488
expect(blockNumber).toBeDefined()
499-
expect(blockTimestamp).toBeTypeOf('bigint')
500-
expect(blockTimestamp).toBeGreaterThan(0n)
501489
expect(chainId).toBeDefined()
502490
expect(from).toBe(account.address.toLowerCase())
503491
expect(gas).toBeDefined()
@@ -559,7 +547,7 @@ describe('sendTransaction', () => {
559547
const {
560548
blockHash,
561549
blockNumber,
562-
blockTimestamp,
550+
blockTimestamp: _blockTimestamp,
563551
calls,
564552
chainId,
565553
feeToken: ___,
@@ -582,8 +570,6 @@ describe('sendTransaction', () => {
582570

583571
expect(blockHash).toBeDefined()
584572
expect(blockNumber).toBeDefined()
585-
expect(blockTimestamp).toBeTypeOf('bigint')
586-
expect(blockTimestamp).toBeGreaterThan(0n)
587573
expect(calls?.length).toBe(1)
588574
expect(chainId).toBeDefined()
589575
expect(from).toBe(account.address.toLowerCase())
@@ -632,7 +618,7 @@ describe('sendTransaction', () => {
632618
const {
633619
blockHash,
634620
blockNumber,
635-
blockTimestamp,
621+
blockTimestamp: _blockTimestamp,
636622
chainId,
637623
feePayerSignature,
638624
feeToken: ___,
@@ -653,8 +639,6 @@ describe('sendTransaction', () => {
653639

654640
expect(blockHash).toBeDefined()
655641
expect(blockNumber).toBeDefined()
656-
expect(blockTimestamp).toBeTypeOf('bigint')
657-
expect(blockTimestamp).toBeGreaterThan(0n)
658642
expect(chainId).toBeDefined()
659643
expect(feePayerSignature).toBeDefined()
660644
expect(from).toBe(account.address.toLowerCase())
@@ -772,7 +756,7 @@ describe('sendTransaction', () => {
772756
const {
773757
blockHash,
774758
blockNumber,
775-
blockTimestamp,
759+
blockTimestamp: _blockTimestamp,
776760
chainId,
777761
feeToken: ___,
778762
from,
@@ -794,8 +778,6 @@ describe('sendTransaction', () => {
794778

795779
expect(blockHash).toBeDefined()
796780
expect(blockNumber).toBeDefined()
797-
expect(blockTimestamp).toBeTypeOf('bigint')
798-
expect(blockTimestamp).toBeGreaterThan(0n)
799781
expect(chainId).toBeDefined()
800782
expect(from).toBeDefined()
801783
expect(gas).toBeDefined()
@@ -980,7 +962,7 @@ describe('sendTransaction', () => {
980962
const {
981963
blockHash,
982964
blockNumber,
983-
blockTimestamp,
965+
blockTimestamp: _blockTimestamp,
984966
chainId,
985967
feeToken: ___,
986968
from,
@@ -1002,8 +984,6 @@ describe('sendTransaction', () => {
1002984

1003985
expect(blockHash).toBeDefined()
1004986
expect(blockNumber).toBeDefined()
1005-
expect(blockTimestamp).toBeTypeOf('bigint')
1006-
expect(blockTimestamp).toBeGreaterThan(0n)
1007987
expect(chainId).toBeDefined()
1008988
expect(from).toBe(account.address.toLowerCase())
1009989
expect(gas).toBeDefined()
@@ -1069,7 +1049,7 @@ describe('sendTransaction', () => {
10691049
const {
10701050
blockHash,
10711051
blockNumber,
1072-
blockTimestamp,
1052+
blockTimestamp: _blockTimestamp,
10731053
calls,
10741054
chainId,
10751055
feeToken: ___,
@@ -1092,8 +1072,6 @@ describe('sendTransaction', () => {
10921072

10931073
expect(blockHash).toBeDefined()
10941074
expect(blockNumber).toBeDefined()
1095-
expect(blockTimestamp).toBeTypeOf('bigint')
1096-
expect(blockTimestamp).toBeGreaterThan(0n)
10971075
expect(calls?.length).toBe(1)
10981076
expect(chainId).toBeDefined()
10991077
expect(from).toBe(account.address.toLowerCase())
@@ -1146,7 +1124,7 @@ describe('sendTransaction', () => {
11461124
const {
11471125
blockHash,
11481126
blockNumber,
1149-
blockTimestamp,
1127+
blockTimestamp: _blockTimestamp,
11501128
chainId,
11511129
feePayerSignature,
11521130
feeToken: ___,
@@ -1167,8 +1145,6 @@ describe('sendTransaction', () => {
11671145

11681146
expect(blockHash).toBeDefined()
11691147
expect(blockNumber).toBeDefined()
1170-
expect(blockTimestamp).toBeTypeOf('bigint')
1171-
expect(blockTimestamp).toBeGreaterThan(0n)
11721148
expect(chainId).toBeDefined()
11731149
expect(feePayerSignature).toBeDefined()
11741150
expect(from).toBe(account.address.toLowerCase())
@@ -1361,7 +1337,7 @@ describe('signTransaction', () => {
13611337
const {
13621338
blockHash,
13631339
blockNumber,
1364-
blockTimestamp,
1340+
blockTimestamp: _blockTimestamp,
13651341
chainId,
13661342
feePayerSignature,
13671343
feeToken: ___,
@@ -1382,8 +1358,6 @@ describe('signTransaction', () => {
13821358

13831359
expect(blockHash).toBeDefined()
13841360
expect(blockNumber).toBeDefined()
1385-
expect(blockTimestamp).toBeTypeOf('bigint')
1386-
expect(blockTimestamp).toBeGreaterThan(0n)
13871361
expect(chainId).toBeDefined()
13881362
expect(feePayerSignature).toBeDefined()
13891363
expect(from).toBe(account.address.toLowerCase())
@@ -1537,7 +1511,7 @@ describe('relay', () => {
15371511
const {
15381512
blockHash,
15391513
blockNumber,
1540-
blockTimestamp,
1514+
blockTimestamp: _blockTimestamp,
15411515
calls,
15421516
chainId,
15431517
feePayerSignature,
@@ -1559,8 +1533,6 @@ describe('relay', () => {
15591533

15601534
expect(blockHash).toBeDefined()
15611535
expect(blockNumber).toBeDefined()
1562-
expect(blockTimestamp).toBeTypeOf('bigint')
1563-
expect(blockTimestamp).toBeGreaterThan(0n)
15641536
expect(calls?.length).toBe(1)
15651537
expect(chainId).toBeDefined()
15661538
expect(feePayerSignature).toBeDefined()
@@ -1662,7 +1634,7 @@ describe('relay', () => {
16621634
const {
16631635
blockHash,
16641636
blockNumber,
1665-
blockTimestamp,
1637+
blockTimestamp: _blockTimestamp,
16661638
calls,
16671639
chainId,
16681640
feePayerSignature,
@@ -1684,8 +1656,6 @@ describe('relay', () => {
16841656

16851657
expect(blockHash).toBeDefined()
16861658
expect(blockNumber).toBeDefined()
1687-
expect(blockTimestamp).toBeTypeOf('bigint')
1688-
expect(blockTimestamp).toBeGreaterThan(0n)
16891659
expect(calls?.length).toBe(1)
16901660
expect(chainId).toBeDefined()
16911661
expect(feePayerSignature).toBeDefined()
@@ -1760,7 +1730,7 @@ describe('relay', () => {
17601730
const {
17611731
blockHash,
17621732
blockNumber,
1763-
blockTimestamp,
1733+
blockTimestamp: _blockTimestamp,
17641734
calls,
17651735
chainId,
17661736
feePayerSignature,
@@ -1782,8 +1752,6 @@ describe('relay', () => {
17821752

17831753
expect(blockHash).toBeDefined()
17841754
expect(blockNumber).toBeDefined()
1785-
expect(blockTimestamp).toBeTypeOf('bigint')
1786-
expect(blockTimestamp).toBeGreaterThan(0n)
17871755
expect(calls?.length).toBe(1)
17881756
expect(chainId).toBeDefined()
17891757
expect(feePayerSignature).toBeDefined()

0 commit comments

Comments
 (0)