Skip to content

Commit 42dddf7

Browse files
committed
solana: fix boolean mistake
1 parent 887db4c commit 42dddf7

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

solana/programs/example-native-token-transfers/src/instructions/redeem.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub struct Redeem<'info> {
2525
#[account(
2626
constraint = config.threshold > 0 @ NTTError::ZeroThreshold,
2727
constraint = config.next_transceiver_id != 0 @ NTTError::NoRegisteredTransceivers,
28-
constraint = config.enabled_transceivers.is_empty() @ NTTError::NoRegisteredTransceivers,
28+
constraint = !config.enabled_transceivers.is_empty() @ NTTError::NoRegisteredTransceivers,
2929
)]
3030
pub config: Account<'info, Config>,
3131

solana/programs/example-native-token-transfers/src/instructions/transfer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub struct Transfer<'info> {
2525
// Ensure that there exists at least one enabled transceiver
2626
#[account(
2727
constraint = config.next_transceiver_id != 0 @ NTTError::NoRegisteredTransceivers,
28-
constraint = config.enabled_transceivers.is_empty() @ NTTError::NoRegisteredTransceivers,
28+
constraint = !config.enabled_transceivers.is_empty() @ NTTError::NoRegisteredTransceivers,
2929
)]
3030
pub config: NotPausedConfig<'info>,
3131

solana/tests/example-native-token-transfer.ts

+15-4
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,36 @@ describe('example-native-token-transfers', () => {
6363
mode: 'locking'
6464
})
6565

66-
await ntt.registerTransceiver({
66+
const transceiver = await ntt.registerTransceiver({
6767
payer,
6868
owner: payer,
6969
transceiver: ntt.program.programId
7070
})
71+
if (transceiver === null) {
72+
throw new Error('did not register transceiver')
73+
}
7174

72-
await ntt.setWormholeTransceiverPeer({
75+
const transceiverPeer = await ntt.setWormholeTransceiverPeer({
7376
payer,
7477
owner: payer,
7578
chain: 'ethereum',
7679
address: Buffer.from('transceiver'.padStart(32, '\0')),
7780
})
81+
if (transceiverPeer === null) {
82+
throw new Error('did not set transceiver peer')
83+
}
7884

79-
await ntt.setPeer({
85+
const peer = await ntt.setPeer({
8086
payer,
8187
owner: payer,
8288
chain: 'ethereum',
8389
address: Buffer.from('nttManager'.padStart(32, '\0')),
8490
limit: new BN(1000000),
8591
tokenDecimals: 18
8692
})
93+
if (peer === null) {
94+
throw new Error('did not set peer')
95+
}
8796

8897
});
8998

@@ -101,7 +110,8 @@ describe('example-native-token-transfers', () => {
101110
amount,
102111
recipientChain: 'ethereum',
103112
recipientAddress: Array.from(user.publicKey.toBuffer()), // TODO: dummy
104-
shouldQueue: false
113+
shouldQueue: false,
114+
config: await ntt.getConfig()
105115
})
106116

107117
const wormholeMessage = ntt.wormholeMessageAccountAddress(outboxItem)
@@ -180,6 +190,7 @@ describe('example-native-token-transfers', () => {
180190
const released = await ntt.redeem({
181191
payer,
182192
vaa: vaaBuf,
193+
config: await ntt.getConfig()
183194
})
184195

185196
expect(released).to.equal(true)

0 commit comments

Comments
 (0)