@@ -128,36 +128,36 @@ impl Nullable for Pubkey {
128
128
129
129
#[ cfg( test) ]
130
130
mod tests {
131
-
132
- use { super :: * , crate :: bytemuck :: pod_slice_from_bytes , solana_program :: sysvar } ;
131
+ use { super :: * , crate :: bytemuck :: pod_slice_from_bytes } ;
132
+ const ID : Pubkey = Pubkey :: from_str_const ( "TestSysvar111111111111111111111111111111111" ) ;
133
133
134
134
#[ test]
135
135
fn test_pod_option_pubkey ( ) {
136
- let some_pubkey = PodOption :: from ( sysvar :: ID ) ;
137
- assert_eq ! ( some_pubkey. get( ) , Some ( sysvar :: ID ) ) ;
136
+ let some_pubkey = PodOption :: from ( ID ) ;
137
+ assert_eq ! ( some_pubkey. get( ) , Some ( ID ) ) ;
138
138
139
139
let none_pubkey = PodOption :: from ( Pubkey :: default ( ) ) ;
140
140
assert_eq ! ( none_pubkey. get( ) , None ) ;
141
141
142
142
let mut data = Vec :: with_capacity ( 64 ) ;
143
- data. extend_from_slice ( sysvar :: ID . as_ref ( ) ) ;
143
+ data. extend_from_slice ( ID . as_ref ( ) ) ;
144
144
data. extend_from_slice ( & [ 0u8 ; 32 ] ) ;
145
145
146
146
let values = pod_slice_from_bytes :: < PodOption < Pubkey > > ( & data) . unwrap ( ) ;
147
- assert_eq ! ( values[ 0 ] , PodOption :: from( sysvar :: ID ) ) ;
147
+ assert_eq ! ( values[ 0 ] , PodOption :: from( ID ) ) ;
148
148
assert_eq ! ( values[ 1 ] , PodOption :: from( Pubkey :: default ( ) ) ) ;
149
149
150
- let option_pubkey = Some ( sysvar :: ID ) ;
150
+ let option_pubkey = Some ( ID ) ;
151
151
let pod_option_pubkey: PodOption < Pubkey > = option_pubkey. try_into ( ) . unwrap ( ) ;
152
- assert_eq ! ( pod_option_pubkey, PodOption :: from( sysvar :: ID ) ) ;
152
+ assert_eq ! ( pod_option_pubkey, PodOption :: from( ID ) ) ;
153
153
assert_eq ! (
154
154
pod_option_pubkey,
155
155
PodOption :: try_from( option_pubkey) . unwrap( )
156
156
) ;
157
157
158
- let coption_pubkey = COption :: Some ( sysvar :: ID ) ;
158
+ let coption_pubkey = COption :: Some ( ID ) ;
159
159
let pod_option_pubkey: PodOption < Pubkey > = coption_pubkey. try_into ( ) . unwrap ( ) ;
160
- assert_eq ! ( pod_option_pubkey, PodOption :: from( sysvar :: ID ) ) ;
160
+ assert_eq ! ( pod_option_pubkey, PodOption :: from( ID ) ) ;
161
161
assert_eq ! (
162
162
pod_option_pubkey,
163
163
PodOption :: try_from( coption_pubkey) . unwrap( )
@@ -166,11 +166,8 @@ mod tests {
166
166
167
167
#[ test]
168
168
fn test_try_from_option ( ) {
169
- let some_pubkey = Some ( sysvar:: ID ) ;
170
- assert_eq ! (
171
- PodOption :: try_from( some_pubkey) . unwrap( ) ,
172
- PodOption ( sysvar:: ID )
173
- ) ;
169
+ let some_pubkey = Some ( ID ) ;
170
+ assert_eq ! ( PodOption :: try_from( some_pubkey) . unwrap( ) , PodOption ( ID ) ) ;
174
171
175
172
let none_pubkey = None ;
176
173
assert_eq ! (
0 commit comments