From f761dbec2a199d5baced1950d71903f66c48d860 Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Tue, 3 Mar 2020 10:22:11 +0100 Subject: [PATCH] Fix linting errors --- bchain/coins/blockchain.go | 2 +- .../omotenashicoinparser_test.go | 150 +++++++++--------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/bchain/coins/blockchain.go b/bchain/coins/blockchain.go index 8c908d91..3a72d04c 100644 --- a/bchain/coins/blockchain.go +++ b/bchain/coins/blockchain.go @@ -27,6 +27,7 @@ import ( "blockbook/bchain/coins/myriad" "blockbook/bchain/coins/namecoin" "blockbook/bchain/coins/nuls" + "blockbook/bchain/coins/omotenashicoin" "blockbook/bchain/coins/pivx" "blockbook/bchain/coins/polis" "blockbook/bchain/coins/qtum" @@ -38,7 +39,6 @@ import ( "blockbook/bchain/coins/vipstarcoin" "blockbook/bchain/coins/xzc" "blockbook/bchain/coins/zec" - "blockbook/bchain/coins/omotenashicoin" "blockbook/common" "context" "encoding/json" diff --git a/bchain/coins/omotenashicoin/omotenashicoinparser_test.go b/bchain/coins/omotenashicoin/omotenashicoinparser_test.go index f246c958..fda8f5ec 100755 --- a/bchain/coins/omotenashicoin/omotenashicoinparser_test.go +++ b/bchain/coins/omotenashicoin/omotenashicoinparser_test.go @@ -42,12 +42,12 @@ func Test_GetAddrDescFromAddress_Mainnet(t *testing.T) { want: "76a9143caafb26e97bc26f27543a523f7e2ab8b841d76988ac", wantErr: false, }, - { - name: "P2SH1", - args: args{address: "8Hkth4xWKCemL8u88urWXwSqUV4WSX5FDm"}, - want: "a9141d521dcf4983772b3c1e6ef937103ebdfaa1ad7787", - wantErr: false, - }, + { + name: "P2SH1", + args: args{address: "8Hkth4xWKCemL8u88urWXwSqUV4WSX5FDm"}, + want: "a9141d521dcf4983772b3c1e6ef937103ebdfaa1ad7787", + wantErr: false, + }, } parser := NewOmotenashiCoinParser(GetChainParams("main"), &btc.Configuration{}) @@ -82,12 +82,12 @@ func Test_GetAddrDescFromAddress_Testnet(t *testing.T) { want: "76a914124a09dbceec6cf2060d72959ba7009649a7783088ac", wantErr: false, }, - { - name: "P2SH1", - args: args{address: "8GkZahDbYJ5m6tKosGy4j7uN5pTF21ktHU"}, - want: "a914124a09dbceec6cf2060d72959ba7009649a7783087", - wantErr: false, - }, + { + name: "P2SH1", + args: args{address: "8GkZahDbYJ5m6tKosGy4j7uN5pTF21ktHU"}, + want: "a914124a09dbceec6cf2060d72959ba7009649a7783087", + wantErr: false, + }, } parser := NewOmotenashiCoinParser(GetChainParams("test"), &btc.Configuration{}) @@ -150,76 +150,76 @@ func Test_GetAddressesFromAddrDesc(t *testing.T) { var ( // Block Height 600 - testTx1 bchain.Tx + testTx1 bchain.Tx testTxPacked_testnet_1 = "0a2054af08185cf5c5d312ebd9865b4b224c6120801b209343cfb9dc3332af28a2a5126401000000010000000000000000000000000000000000000000000000000000000000000000ffffffff050258020101ffffffff0100e87648170000002321024a9c0d55966c7a46d8ac15830c6c26555a2b570a3e78c51534ccc8dadc7943c8ac000000001894e38ff105200028d80432140a0a30323538303230313031180028ffffffff0f3a520a05174876e80010001a2321024a9c0d55966c7a46d8ac15830c6c26555a2b570a3e78c51534ccc8dadc7943c8ac2222616e667766545642725934795a4e54543167625a61584e664854377951544856674d4000" // Block Height 135001 - testTx2 bchain.Tx + testTx2 bchain.Tx testTxPacked_mainnet_1 = "0a20a2eedb3990bddcace3a5211332e86f70d0195a2a7efaad2de18698172ff9fc6d128f0102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff1803590f020445b8075e088104e0b22c0000007969696d70000000000002807c814a000000001976a91487bac515ab40891b58a05c913f908194c9d73bd588ac807584df000000001976a914a1441e207bd13f80b2142026ad39a58b5f47434d88ac0000000018c4f09ef005200028d99e0832360a30303335393066303230343435623830373565303838313034653062323263303030303030373936393639366437303030180028003a470a044a817c8010001a1976a91487bac515ab40891b58a05c913f908194c9d73bd588ac2222535a66667a6a666454486f7a394675684a5444453847704378455762544c433654743a470a04df84758010001a1976a914a1441e207bd13f80b2142026ad39a58b5f47434d88ac222253627a685264475855475245556b70557a67716877615847666f4244447565366b364000" ) func init() { - testTx1 = bchain.Tx{ - Hex: "01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff050258020101ffffffff0100e87648170000002321024a9c0d55966c7a46d8ac15830c6c26555a2b570a3e78c51534ccc8dadc7943c8ac00000000", - Txid: "54af08185cf5c5d312ebd9865b4b224c6120801b209343cfb9dc3332af28a2a5", - LockTime: 0, - Vin: []bchain.Vin{ - { - Coinbase: "0258020101", - Sequence: 4294967295, - }, - }, - Vout: []bchain.Vout{ - { - ValueSat: *big.NewInt(100000000000), - N: 0, - ScriptPubKey: bchain.ScriptPubKey{ - Hex: "21024a9c0d55966c7a46d8ac15830c6c26555a2b570a3e78c51534ccc8dadc7943c8ac", - Addresses: []string{ - "anfwfTVBrY4yZNTT1gbZaXNfHT7yQTHVgM", - }, - }, - }, - }, - Blocktime: 1579413908, - Time: 1579413908, - } + testTx1 = bchain.Tx{ + Hex: "01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff050258020101ffffffff0100e87648170000002321024a9c0d55966c7a46d8ac15830c6c26555a2b570a3e78c51534ccc8dadc7943c8ac00000000", + Txid: "54af08185cf5c5d312ebd9865b4b224c6120801b209343cfb9dc3332af28a2a5", + LockTime: 0, + Vin: []bchain.Vin{ + { + Coinbase: "0258020101", + Sequence: 4294967295, + }, + }, + Vout: []bchain.Vout{ + { + ValueSat: *big.NewInt(100000000000), + N: 0, + ScriptPubKey: bchain.ScriptPubKey{ + Hex: "21024a9c0d55966c7a46d8ac15830c6c26555a2b570a3e78c51534ccc8dadc7943c8ac", + Addresses: []string{ + "anfwfTVBrY4yZNTT1gbZaXNfHT7yQTHVgM", + }, + }, + }, + }, + Blocktime: 1579413908, + Time: 1579413908, + } - //135001 + //135001 testTx2 = bchain.Tx{ - Hex: "02000000010000000000000000000000000000000000000000000000000000000000000000ffffffff1803590f020445b8075e088104e0b22c0000007969696d70000000000002807c814a000000001976a91487bac515ab40891b58a05c913f908194c9d73bd588ac807584df000000001976a914a1441e207bd13f80b2142026ad39a58b5f47434d88ac00000000", - Txid: "a2eedb3990bddcace3a5211332e86f70d0195a2a7efaad2de18698172ff9fc6d", - LockTime: 0, - Vin: []bchain.Vin{ - { - Coinbase: "03590f020445b8075e088104e0b22c0000007969696d7000", - Sequence: 0, - }, - }, - Vout: []bchain.Vout{ - { - ValueSat: *big.NewInt(1250000000), - N: 0, - ScriptPubKey: bchain.ScriptPubKey{ - Hex: "76a91487bac515ab40891b58a05c913f908194c9d73bd588ac", - Addresses: []string{ - "SZffzjfdTHoz9FuhJTDE8GpCxEWbTLC6Tt", - }, - }, - }, - { - ValueSat: *big.NewInt(3750000000), - N: 0, - ScriptPubKey: bchain.ScriptPubKey{ - Hex: "76a914a1441e207bd13f80b2142026ad39a58b5f47434d88ac", - Addresses: []string{ - "SbzhRdGXUGREUkpUzgqhwaXGfoBDDue6k6", - }, - }, - }, - }, - Blocktime: 1577564228, - Time: 1577564228, + Hex: "02000000010000000000000000000000000000000000000000000000000000000000000000ffffffff1803590f020445b8075e088104e0b22c0000007969696d70000000000002807c814a000000001976a91487bac515ab40891b58a05c913f908194c9d73bd588ac807584df000000001976a914a1441e207bd13f80b2142026ad39a58b5f47434d88ac00000000", + Txid: "a2eedb3990bddcace3a5211332e86f70d0195a2a7efaad2de18698172ff9fc6d", + LockTime: 0, + Vin: []bchain.Vin{ + { + Coinbase: "03590f020445b8075e088104e0b22c0000007969696d7000", + Sequence: 0, + }, + }, + Vout: []bchain.Vout{ + { + ValueSat: *big.NewInt(1250000000), + N: 0, + ScriptPubKey: bchain.ScriptPubKey{ + Hex: "76a91487bac515ab40891b58a05c913f908194c9d73bd588ac", + Addresses: []string{ + "SZffzjfdTHoz9FuhJTDE8GpCxEWbTLC6Tt", + }, + }, + }, + { + ValueSat: *big.NewInt(3750000000), + N: 0, + ScriptPubKey: bchain.ScriptPubKey{ + Hex: "76a914a1441e207bd13f80b2142026ad39a58b5f47434d88ac", + Addresses: []string{ + "SbzhRdGXUGREUkpUzgqhwaXGfoBDDue6k6", + }, + }, + }, + }, + Blocktime: 1577564228, + Time: 1577564228, } } @@ -303,7 +303,7 @@ func Test_UnpackTx(t *testing.T) { parser: NewOmotenashiCoinParser(GetChainParams("main"), &btc.Configuration{}), }, want: &testTx2, - want1: 135001, + want1: 135001, wantErr: false, }, } @@ -345,7 +345,7 @@ var testParseBlockTxs = map[int]testBlock{ size: 224, time: 1577564228, tx: []string{ - "a2eedb3990bddcace3a5211332e86f70d0195a2a7efaad2de18698172ff9fc6d", + "a2eedb3990bddcace3a5211332e86f70d0195a2a7efaad2de18698172ff9fc6d", }, }, }