fixup

Author: mgild

Cargo.lock

@@ -11,8 +11,8 @@ edition = "2018"
 arrayref = "0.3.6"
 borsh = "0.10.3"
 bytemuck = "1.5.1"
-num-derive = "0.3"
-num-traits = "0.2"
+num-derive = "=0.4"
+num-traits = "=0.2"
 solana-program = ">=1.9,<2"
 spl-token = { version = "^3.2.0,<4", features=["no-entrypoint"] }
 static_assertions = "1.1.0"

token-lending/sdk/Cargo.toml

@@ -1,13 +1,13 @@
 //! Error types
 
-use num_derive::FromPrimitive;
+// use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
 use solana_program::{decode_error::DecodeError, program_error::ProgramError};
 use solana_program::{msg, program_error::PrintProgramError};
 use thiserror::Error;
 
 /// Errors that may be returned by the TokenLending program.
-#[derive(Clone, Debug, Eq, Error, FromPrimitive, PartialEq)]
+#[derive(Clone, Debug, Eq, Error, PartialEq)]
 pub enum LendingError {
     // 0
     /// Invalid instruction data passed in.

token-lending/sdk/src/error.rs

@@ -4,8 +4,7 @@ use crate::{
     math::{Decimal, Rate, TryAdd, TryDiv, TryMul, TrySub},
 };
 use arrayref::{array_mut_ref, array_ref, array_refs, mut_array_refs};
-use num_derive::FromPrimitive;
-use num_traits::FromPrimitive;
+use num_traits::FromPrimitive as _;
 use solana_program::{
     clock::Slot,
     entrypoint::ProgramResult,
@@ -971,7 +970,7 @@ pub struct ReserveConfig {
     pub fee_receiver: Pubkey,
     /// Cut of the liquidation bonus that the protocol receives, in deca bps
     pub protocol_liquidation_fee: u8,
-    /// Protocol take rate is the amount borrowed interest protocol recieves, as a percentage  
+    /// Protocol take rate is the amount borrowed interest protocol recieves, as a percentage
     pub protocol_take_rate: u8,
     /// Added borrow weight in basis points. THIS FIELD SHOULD NEVER BE USED DIRECTLY. Always use
     /// borrow_weight()
@@ -1094,7 +1093,8 @@ pub fn validate_reserve_config(config: ReserveConfig) -> ProgramResult {
     Ok(())
 }
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, FromPrimitive)]
+#[allow(non_local_definitions)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, num_derive::FromPrimitive)]
 /// Asset Type of the reserve
 pub enum ReserveType {
     #[default]