Skip to content

Commit

Permalink
update dplyr function specifier on rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Conor Flynn committed Apr 28, 2023
1 parent 9e15e1d commit 721aa55
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions R-Code-Samples/GetTransactions.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,9 @@ get_transactions <- function(data) {
mutate(borrowRate = as.numeric(borrowRate) / (10^25)) %>%
mutate(pool = pool) %>%
left_join(aliases, by = c("user" = "id")) %>%
rename(userAlias = alias) %>%
dplyr::rename(userAlias = alias) %>%
left_join(aliases, by = c("onBehalfOf" = "id")) %>%
rename(onBehalfOfAlias = alias) %>%
dplyr::rename(onBehalfOfAlias = alias) %>%
select(id, type, timestamp, user, userAlias, onBehalfOf, onBehalfOfAlias, pool,
reserve, amount, amountUSD, amountETH, borrowRate, borrowRateMode) %>%
drop_na() %>%
Expand All @@ -379,7 +379,7 @@ get_transactions <- function(data) {
left_join(reserveParamsHistory, by = c("id" = "txID", "timestamp", "reserve")) %>%
mutate(reserve = symbol) %>%
left_join(aliases, by = c("user" = "id")) %>%
rename(userAlias = alias) %>%
dplyr::rename(userAlias = alias) %>%
select(id, timestamp, user, userAlias, pool, reserve, fromState, toState, type) %>%
drop_na() %>%
distinct()
Expand All @@ -397,9 +397,9 @@ get_transactions <- function(data) {
mutate(priceInEth = as.numeric(priceInEth) / (10^18)) %>%
mutate(amountETH = as.numeric(amount) * as.numeric(priceInEth)) %>%
left_join(aliases, by = c("user" = "id")) %>%
rename(userAlias = alias) %>%
dplyr::rename(userAlias = alias) %>%
left_join(aliases, by = c("onBehalfOf" = "id")) %>%
rename(onBehalfOfAlias = alias) %>%
dplyr::rename(onBehalfOfAlias = alias) %>%
select(id, timestamp, type, amount, amountUSD, amountETH, reserve, user, userAlias,
onBehalfOf, onBehalfOfAlias, pool) %>%
drop_na() %>%
Expand All @@ -425,9 +425,9 @@ get_transactions <- function(data) {
principalAmount, principalReserve, principalAmountUSD, principalAmountETH,
collateralAmount, collateralReserve = symbol, collateralAmountUSD, collateralAmountETH) %>%
left_join(aliases, by = c("user" = "id")) %>%
rename(userAlias = alias) %>%
dplyr::rename(userAlias = alias) %>%
left_join(aliases, by = c("liquidator" = "id")) %>%
rename(liquidatorAlias = alias) %>%
dplyr::rename(liquidatorAlias = alias) %>%
distinct()
# mutate and parse redeems df
Expand All @@ -443,9 +443,9 @@ get_transactions <- function(data) {
mutate(priceInEth = as.numeric(priceInEth) / (10^18)) %>%
mutate(amountETH = as.numeric(amount) * as.numeric(priceInEth)) %>%
left_join(aliases, by = c("user" = "id")) %>%
rename(userAlias = alias) %>%
dplyr::rename(userAlias = alias) %>%
left_join(aliases, by = c("onBehalfOf" = "id")) %>%
rename(onBehalfOfAlias = alias) %>%
dplyr::rename(onBehalfOfAlias = alias) %>%
select(id,timestamp, type, amount, amountUSD, amountETH, reserve, user, userAlias,
onBehalfOf, onBehalfOfAlias, priceInUsd, pool) %>%
drop_na() %>%
Expand All @@ -464,9 +464,9 @@ get_transactions <- function(data) {
mutate(priceInEth = as.numeric(priceInEth) / (10^18)) %>%
mutate(amountETH = as.numeric(amount) * as.numeric(priceInEth)) %>%
left_join(aliases, by = c("user" = "id")) %>%
rename(userAlias = alias) %>%
dplyr::rename(userAlias = alias) %>%
left_join(aliases, by = c("onBehalfOf" = "id")) %>%
rename(onBehalfOfAlias = alias) %>%
dplyr::rename(onBehalfOfAlias = alias) %>%
select(id, timestamp, type, amount, amountUSD, amountETH, reserve, user, userAlias,
onBehalfOf, onBehalfOfAlias, priceInUsd, pool) %>%
drop_na() %>%
Expand All @@ -481,7 +481,7 @@ get_transactions <- function(data) {
left_join(reserveParamsHistory, by = c("id" = "txID", "timestamp", "reserve")) %>%
mutate(reserve = symbol) %>%
left_join(aliases, by = c("user" = "id")) %>%
rename(userAlias = alias) %>%
dplyr::rename(userAlias = alias) %>%
select(id, timestamp, type, reserve, user, userAlias, pool, borrowRateModeTo,
borrowRateModeFrom, stableBorrowRate = stableBorrowRate.x, variableBorrowRate = variableBorrowRate.x) %>%
drop_na() %>%
Expand Down

0 comments on commit 721aa55

Please sign in to comment.