Skip to content
This repository has been archived by the owner on Dec 19, 2021. It is now read-only.

Commit

Permalink
Changes for compatibility with new usoamickt lib
Browse files Browse the repository at this point in the history
  • Loading branch information
primys committed Oct 26, 2019
1 parent 7f923b7 commit 83c4d50
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
6 changes: 4 additions & 2 deletions src/main/kotlin/io/usoamic/cli/di/UsoamicModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ package io.usoamic.cli.di
import dagger.Module
import dagger.Provides
import io.usoamic.usoamickt.core.Usoamic
import io.usoamic.usoamickt.other.Config
import io.usoamic.usoamickt.enum.NetworkType
import io.usoamic.usoamickt.enum.NodeProvider
import io.usoamic.usoamickt.model.Account
import javax.inject.Singleton

@Module
class UsoamicModule {
@Provides
@Singleton
fun provideContract(): Usoamic {
return Usoamic(Config.ACCOUNT_FILENAME, Config.CONTRACT_ADDRESS, Config.NODE)
return Usoamic(Account.FILENAME, NetworkType.MAINNET, NodeProvider.INFURA)
}
}
5 changes: 3 additions & 2 deletions src/test/kotlin/io/usoamic/testcli/di/TestUsoamicModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import dagger.Module
import dagger.Provides
import io.usoamic.testcli.other.TestConfig
import io.usoamic.usoamickt.core.Usoamic
import io.usoamic.usoamickt.other.Config
import io.usoamic.usoamickt.enum.NetworkType
import io.usoamic.usoamickt.enum.NodeProvider
import javax.inject.Singleton

@Module
class TestUsoamicModule {
@Provides
@Singleton
fun provideContract(): Usoamic {
return Usoamic(TestConfig.ACCOUNT_FILENAME, TestConfig.CONTRACT_ADDRESS, TestConfig.NODE)
return Usoamic(TestConfig.ACCOUNT_FILENAME, NetworkType.TESTNET, NodeProvider.INFURA)
}
}
9 changes: 4 additions & 5 deletions src/test/kotlin/io/usoamic/testcli/other/TestConfig.kt
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package io.usoamic.testcli.other

import io.usoamic.usoamickt.other.Config
import io.usoamic.usoamickt.enum.NetworkType
import io.usoamic.usoamickt.other.Contract

class TestConfig {
companion object {
const val NODE: String = "https://rinkeby.infura.io:443"
const val ACCOUNT_FILENAME: String = "test_account.json"
const val CONTRACT_ADDRESS: String = Config.CONTRACT_ADDRESS
val CONTRACT_ADDRESS: String = Contract.forNetwork(NetworkType.TESTNET)
const val DEFAULT_ADDRESS: String = "0x8b27fa2987630a1acd8d868ba84b2928de737bc2"
const val OWNER_ADDRESS: String = "0x5d8766ac0075bdf81b48f0bfcf92449e9def0f37"
const val PASSWORD: String = "1234!"
const val VERSION: String = "v2"
const val VERSION: String = "v2.1.1"
}
}

0 comments on commit 83c4d50

Please sign in to comment.