Merge pull request #16 from OpenFuturePlatform/minor-changes

Minor changes

Author: ruslanys

README.md

@@ -17,7 +17,6 @@ Input arguments:
 * `-c, --contract`          Address of token Smart contract [_required_]
 * `-f, --from`              Start block number [_optional_, default is 0]
 * `-t, --to`                End block number [_optional, default is **latest block**_]
-* `-d, --decimals`          Snapshot decimals value [_optional_, default is **8**]
 * `-o, --output`            Name of csv file to save [_optional_, default is **snapshot_at_block_toBlocknumber**]
 * `-m, --mode`              Snapshot mode [_optional_, possible values are ARCHIVED and EVENT, default is **EVENT**]
 * `-h, --help`              Show available options and exit

src/main/kotlin/io/openfuture/snapshot/exporter/CsvSnapshotExporter.kt

@@ -5,7 +5,7 @@ import java.io.PrintWriter
 
 class CsvSnapshotExporter : FileExporter {
 
-    override fun export(fileName: String, walletStates: List<WalletState>) {
+    override fun export(fileName: String, walletStates: Collection<WalletState>) {
         val writer = PrintWriter(fileName, "UTF-8")
         writer.println(HEADERS)
         walletStates.forEach {

src/main/kotlin/io/openfuture/snapshot/exporter/FileExporter.kt

@@ -4,6 +4,6 @@ import io.openfuture.snapshot.domain.WalletState
 
 interface FileExporter {
 
-    fun export(fileName: String, walletStates: List<WalletState>)
+    fun export(fileName: String, walletStates: Collection<WalletState>)
 
 }

src/main/kotlin/io/openfuture/snapshot/snapshot/ArchivedNodeBasedSnapshotCreator.kt

@@ -32,7 +32,7 @@ class ArchivedNodeBasedSnapshotCreator(nodeAddress: String) : SnapshotCreator {
 
             println("Batch fetching addresses from $blockNumber to $nextBatch blocks")
             val transfers = web3jHelper.getTransfers(contractAddress, blockNumber, nextBatch)
-            val fetchedAddresses = transfers.map { it.fromAddress }
+            val fetchedAddresses = transfers.map { it.toAddress }
 
             addresses.addAll(fetchedAddresses)
         }

src/main/kotlin/io/openfuture/snapshot/snapshot/EventBasedSnapshotCreator.kt

@@ -37,7 +37,7 @@ class EventBasedSnapshotCreator(nodeAddress: String) : SnapshotCreator {
             }
 
             val fromAmount = walletStateMap.getOrDefault(transfer.fromAddress, BigDecimal.ZERO)
-            walletStateMap.replace(transfer.fromAddress, fromAmount.minus(transfer.amount))
+            walletStateMap[transfer.fromAddress] = fromAmount.minus(transfer.amount)
         }
     }