From c1405ffedc316908bf02c2f5de8064d517171482 Mon Sep 17 00:00:00 2001 From: fudongbai <296179868@qq.com> Date: Sat, 2 Feb 2019 16:12:35 +0800 Subject: [PATCH] update amino version --- e2e/e2e_test.go | 15 ++++++++------- go.mod | 2 +- go.sum | 3 ++- keys/keys.go | 2 +- keys/keys_test.go | 33 +++++++++++++-------------------- types/account.go | 3 --- 6 files changed, 25 insertions(+), 33 deletions(-) diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 2e5dd70c..fa236139 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -2,26 +2,26 @@ package e2e import ( "fmt" - sdk "github.com/binance-chain/go-sdk/client" - "github.com/binance-chain/go-sdk/client/query" - "github.com/binance-chain/go-sdk/common" - "github.com/binance-chain/go-sdk/types" - "github.com/binance-chain/go-sdk/types/msg" - tx2 "github.com/binance-chain/go-sdk/types/tx" "testing" time2 "time" "github.com/stretchr/testify/assert" + sdk "github.com/binance-chain/go-sdk/client" + "github.com/binance-chain/go-sdk/client/query" + "github.com/binance-chain/go-sdk/common" "github.com/binance-chain/go-sdk/common/crypto" "github.com/binance-chain/go-sdk/common/crypto/secp256k1" "github.com/binance-chain/go-sdk/keys" + "github.com/binance-chain/go-sdk/types" + "github.com/binance-chain/go-sdk/types/msg" + tx2 "github.com/binance-chain/go-sdk/types/tx" ) // After bnbchain integration_test.sh has runned func TestAllProcess(t *testing.T) { //----- Recover account --------- - mnemonic := "ghost ranch desert van bleak parent leisure garden tenant hawk panel image later raccoon pave original artwork ridge snake spare food such baby thank" + mnemonic := "this is a test mnemonic" keyManager, err := keys.NewMnemonicKeyManager(mnemonic) assert.NoError(t, err) testAccount1 := keyManager.GetAddr() @@ -80,6 +80,7 @@ func TestAllProcess(t *testing.T) { //----- Create order ----------- createOrderResult, err := client.CreateOrder(tradeSymbol, nativeSymbol, msg.OrderSide.SELL, 30000000000, 10000000000000, true) + fmt.Println(err) assert.NoError(t, err) assert.True(t, true, createOrderResult.Ok) diff --git a/go.mod b/go.mod index 0d30ecc9..96a0708e 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/stretchr/testify v1.2.2 github.com/tendermint/btcd v0.0.0-20180816174608-e5840949ff4f github.com/tendermint/ed25519 v0.0.0-20171027050219-d8387025d2b9 // indirect - github.com/tendermint/go-amino v0.12.0 + github.com/tendermint/go-amino v0.14.1 golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 golang.org/x/sys v0.0.0-20181116161606-93218def8b18 // indirect gopkg.in/resty.v1 v1.10.3 diff --git a/go.sum b/go.sum index 83b3e690..de1ff16d 100644 --- a/go.sum +++ b/go.sum @@ -16,7 +16,8 @@ github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/tendermint/btcd v0.0.0-20180816174608-e5840949ff4f/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= github.com/tendermint/ed25519 v0.0.0-20171027050219-d8387025d2b9/go.mod h1:nt45hbhDkWVdMBkr2TOgOzCrpBccXdN09WOiOYTHVEk= -github.com/tendermint/go-amino v0.12.0/go.mod h1:i/UKE5Uocn+argJJBb12qTZsCDBcAYMbR92AaJVmKso= +github.com/tendermint/go-amino v0.14.1 h1:o2WudxNfdLNBwMyl2dqOJxiro5rfrEaU0Ugs6offJMk= +github.com/tendermint/go-amino v0.14.1/go.mod h1:i/UKE5Uocn+argJJBb12qTZsCDBcAYMbR92AaJVmKso= golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 h1:kkXA53yGe04D0adEYJwEVQjeBppL01Exg+fnMjfUraU= golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1 h1:Y/KGZSOdz/2r0WJ9Mkmz6NJBusp0kiNx1Cn82lzJQ6w= diff --git a/keys/keys.go b/keys/keys.go index 727aafd4..e4b7e8d8 100644 --- a/keys/keys.go +++ b/keys/keys.go @@ -127,7 +127,7 @@ func (m *keyManager) Sign(msg tx.StdSignMsg) ([]byte, error) { return nil, err } newTx := tx.NewStdTx(msg.Msgs, []tx.StdSignature{sig}, msg.Memo, msg.Source, msg.Data) - bz, err := tx.Cdc.MarshalBinary(&newTx) + bz, err := tx.Cdc.MarshalBinaryLengthPrefixed(&newTx) if err != nil { return nil, err } diff --git a/keys/keys_test.go b/keys/keys_test.go index 873232da..10759183 100644 --- a/keys/keys_test.go +++ b/keys/keys_test.go @@ -10,18 +10,13 @@ import ( "github.com/stretchr/testify/assert" ) -func setup(){ - types.Network = types.UnitTestNetwork -} - func TestRecoveryFromKeyWordsNoError(t *testing.T) { - setup() mnemonic := "bottom quick strong ranch section decide pepper broken oven demand coin run jacket curious business achieve mule bamboo remain vote kid rigid bench rubber" keyManger, err := NewMnemonicKeyManager(mnemonic) assert.NoError(t, err) acc := keyManger.GetAddr() key := keyManger.GetPrivKey() - if acc.String() != "bnc1ddt3ls9fjcd8mh69ujdg3fxc89qle2a7a9x6sk" { + if acc.String() != "bnb1ddt3ls9fjcd8mh69ujdg3fxc89qle2a7km33aa" { t.Fatalf("RecoveryFromKeyWords get unstable account") } if key == nil { @@ -30,7 +25,6 @@ func TestRecoveryFromKeyWordsNoError(t *testing.T) { } func TestRecoveryFromKeyBaseNoError(t *testing.T) { - setup() file := "testkeystore.json" planText := []byte("Test msg") keyManager, err := NewKeyStoreKeyManager(file, "Zjubfd@123") @@ -42,7 +36,6 @@ func TestRecoveryFromKeyBaseNoError(t *testing.T) { } func TestRecoveryPrivateKeyNoError(t *testing.T) { - setup() planText := []byte("Test msg") priv := "9579fff0cab07a4379e845a890105004ba4c8276f8ad9d22082b2acbf02d884b" keyManager, err := NewPrivateKeyManager(priv) @@ -54,7 +47,7 @@ func TestRecoveryPrivateKeyNoError(t *testing.T) { } func TestSignTxNoError(t *testing.T) { - setup() + test1Mnemonic := "swift slam quote sail high remain mandate sample now stamp title among fiscal captain joy puppy ghost arrow attract ozone situate install gain mean" test2Mnemonic := "bottom quick strong ranch section decide pepper broken oven demand coin run jacket curious business achieve mule bamboo remain vote kid rigid bench rubber" @@ -78,7 +71,7 @@ func TestSignTxNoError(t *testing.T) { test1KeyManger, 0, 1, - "c601f0625dee0a522a2c87fa0a250a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa120d0a03424e42108080d287e2bc2d12250a146b571fc0a9961a7ddf45e49a88a4d83941fcabbe120d0a03424e42108080d287e2bc2d126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c9711240a4d54e307ae18bd8783ab4dca7b220f9a57fb944e1bf77d5f50bea6dec00699760ccbeb3fb67df4f58b3a2edbf6b884476ac0beba1662bfcc51989789be4351a2002", + "c601f0625dee0a522a2c87fa0a250a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa120d0a03424e42108080e983b1de1612250a146b571fc0a9961a7ddf45e49a88a4d83941fcabbe120d0a03424e42108080e983b1de16126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c97112408e005453d5a6109d1d0a03b0383f20fb1c77bfa39d4230489627873161a2876e60104b94131331f0a7aec574834f74c8720654b1b1b16a8672a5f5f7c74b215a2001", "send message sign error", }, { @@ -86,14 +79,14 @@ func TestSignTxNoError(t *testing.T) { test2KeyManagr, 1, 0, - "a701f0625dee0a3317efab800a146b571fc0a9961a7ddf45e49a88a4d83941fcabbe1207426974636f696e1a03425443208080b4ccd4dfc6032801126c0a26eb5ae9872103d8f33449356d58b699f6b16a498bd391aa5e051085415d0fe1873939bc1d2e3a124005083827b50bbb538ca1c1d43cc269bac51db692687cfd143d5c9ab5e361a64614f877f7790aa34ca45df006a794d94d1a5fe18057ed6b5be0ac8a187301a0bb1802", + "a701f0625dee0a3317efab800a146b571fc0a9961a7ddf45e49a88a4d83941fcabbe1207426974636f696e1a034254432080809aa6eaafe3012801126c0a26eb5ae9872103d8f33449356d58b699f6b16a498bd391aa5e051085415d0fe1873939bc1d2e3a12403686586a55f8c50a11ae6f09c35734f09830a566823846f9333c3e53f6d83d4a2cd3a0542c37a8d28b474f563d44223ba6c2b7cf260539b7b85020999ebe2c001801", "issue message sign error", }, {msg.NewMsgSubmitProposal("list BTC/BNB", "{\"base_asset_symbol\":\"BTC-86A\",\"quote_asset_symbol\":\"BNB\",\"init_price\":100000000,\"description\":\"list BTC/BNB\",\"expire_time\":\"2018-12-24T00:46:05+08:00\"}", msg.ProposalTypeListTradingPair, test1Addr, types.Coins{types.Coin{Denom: "BNB", Amount: 200000000000}}), test1KeyManger, 0, 2, - "c802f0625dee0ad301b42d614e0a0c6c697374204254432f424e421298017b22626173655f61737365745f73796d626f6c223a224254432d383641222c2271756f74655f61737365745f73796d626f6c223a22424e42222c22696e69745f7072696365223a3130303030303030302c226465736372697074696f6e223a226c697374204254432f424e42222c226578706972655f74696d65223a22323031382d31322d32345430303a34363a30352b30383a3030227d180422141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa2a0c0a03424e421080c0ee8ed20b126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c9711240594b7e2e44cc210815d68cbea769666de3d2053b35a3e5d120016350f1ae2b8d4c8ea1ce124dd1223a8c646703b35d21776880f7812741821930e16cbbc227d32004", + "c802f0625dee0ad301b42d614e0a0c6c697374204254432f424e421298017b22626173655f61737365745f73796d626f6c223a224254432d383641222c2271756f74655f61737365745f73796d626f6c223a22424e42222c22696e69745f7072696365223a3130303030303030302c226465736372697074696f6e223a226c697374204254432f424e42222c226578706972655f74696d65223a22323031382d31322d32345430303a34363a30352b30383a3030227d180422141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa2a0c0a03424e421080a0b787e905126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c971124053292ece8b9d2258ea6d22399ec988d75aab526056219174373b45bb1372d0a12f5853a196f56b1cc9e13fef7ab6debfdb43a36c175f40de99193ac7b319a53d2002", "submit proposal sign error", }, { @@ -101,7 +94,7 @@ func TestSignTxNoError(t *testing.T) { test1KeyManger, 0, 3, - "9201f0625dee0a1ea1cadd36080212141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa1801126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c9711240db2d60b2b8fd86eb8183a6ad146ed476abe814bd256516c4b22df027fbf9717d01a269ea5d04878a70a20db1573de5853580a52025049103772d1baf5d52a3dd2006", + "9201f0625dee0a1ea1cadd36080112141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa1801126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c97112405a2394615da1d744e991b0cc0f188ac2d7108259e15ba0b992729a8ee54e77e5641dd2ed846d59be468be2daeb628c3a6633187225a0ce85db884c965467baf52003", "vote proposal sign error", }, { @@ -109,14 +102,14 @@ func TestSignTxNoError(t *testing.T) { test2KeyManagr, 1, 2, - "a501f0625dee0a2fb41de13f0a146b571fc0a9961a7ddf45e49a88a4d83941fcabbe10021a074254432d3836412203424e42288084af5f126e0a26eb5ae9872103d8f33449356d58b699f6b16a498bd391aa5e051085415d0fe1873939bc1d2e3a12409933cf7c386c24bb178b071e0a59fb1d2e1357acfa444722ca0689551c9ba3816494e171d285dec9322e2fdc89c57aebe59af74f35db5c5da1c9738502b8f97c18022004", + "a501f0625dee0a2fb41de13f0a146b571fc0a9961a7ddf45e49a88a4d83941fcabbe10011a074254432d3836412203424e422880c2d72f126e0a26eb5ae9872103d8f33449356d58b699f6b16a498bd391aa5e051085415d0fe1873939bc1d2e3a1240ce897838dd4d70d3c337b62ac1f60ec022bb2bf281fb77eca95adcd64de0a6aa574b128c5f732545c8b0e62dcd1cd90f9898c5f7781ae9d64042859c4e40558b18012002", "List tradimg sign error", }, {msg.NewCreateOrderMsg(test1Addr, "1D0E3086E8E4E0A53C38A90D55BD58B34D57D2FA-5", 1, "BTC-86A_BNB", 100000000, 1000000000), test1KeyManger, 0, 4, - "d801f0625dee0a64ce6dc0430a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa122a314430453330383645384534453041353343333841393044353542443538423334443537443246412d351a0b4254432d3836415f424e4220042802308084af5f3880a8d6b9074002126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c971124014ef51e96c0471057f5ad619deaf55acb35364a1df3254284d3c05913ce8cb0870315b2562a5fe0a1d5ea7cdb26fcd6f1d6ba38188e5d13b1abddf5e91e538412008", + "d801f0625dee0a64ce6dc0430a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa122a314430453330383645384534453041353343333841393044353542443538423334443537443246412d351a0b4254432d3836415f424e42200428023080c2d72f388094ebdc034002126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c97112409fe317e036f2bdc8c87a0138dc52367faef80ea1d6e21a35634b17a82ed7be632c9cb03f865f6f8a6872736ccab716a157f3cb99339afa55686aa455dc134f6a2004", "Create order sign error", }, { @@ -124,7 +117,7 @@ func TestSignTxNoError(t *testing.T) { test1KeyManger, 0, 5, - "c701f0625dee0a53166e681b0a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa120b4254432d3836415f424e421a2a314430453330383645384534453041353343333841393044353542443538423334443537443246412d35126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c971124026fc44b689f3e8b4abbd58a4ae9440cef2d650db191f99d2b50ff69abd5340675feb98644f64a16e5d842236b3976e17c4ba2db842bed7f4f6c4548d468977fa200a", + "c701f0625dee0a53166e681b0a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa120b4254432d3836415f424e421a2a314430453330383645384534453041353343333841393044353542443538423334443537443246412d35126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c9711240fe2fd18630317849bd1d4ae064f8c4fd95f6186bdb61e2b73a5fb5e93ac7794d4a990ba943694659df9d3f49d5312fec020b80148677f3e95fd6d88486bba19d2005", "Cancel order sign error", }, { @@ -132,7 +125,7 @@ func TestSignTxNoError(t *testing.T) { test1KeyManger, 0, 10, - "9a01f0625dee0a26e774b32d0a200a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa1203424e42188084af5f126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c9711240b8190928bbfb3bed2bf968e37c022bd254f65de5554bec250349303b79a4c5d0367a76fd7a544f7d2c47af014aadd010ce249236a22f229ee9862539c5d37a7c2014", + "9a01f0625dee0a26e774b32d0a200a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa1203424e421880c2d72f126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c971124013142dc274677af4f09d4be295f1855709b7608e1a9d4cc76aa23103c092ce1915c0ed51fc3c8a8510b57a7a8e8d532c6f5d1159cdb0e7333dda0d0a9e55cac4200a", "Freeze token sign error", }, { @@ -140,7 +133,7 @@ func TestSignTxNoError(t *testing.T) { test1KeyManger, 0, 11, - "9a01f0625dee0a266515ff0d0a200a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa1203424e42188084af5f126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c9711240f219b84d2b2e5c8bd361330f9d9d43d926d8dad11684116eeff11d4a4099139279e8957f00d09f8f7567350dbbe3029ae52ba0fd65818ca89840bb0aad517e762016", + "9a01f0625dee0a266515ff0d0a200a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa1203424e421880c2d72f126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c9711240af320bdecb27fe5f7f89abcb9ffc11df2479859fa66586654f36425d908ff7a32921c9af658f86c63db797981a3110db33c6033db017bdca5ca87b1c440c8fc6200b", "Unfreeze token sign error", }, { @@ -148,7 +141,7 @@ func TestSignTxNoError(t *testing.T) { test1KeyManger, 0, 12, - "9a01f0625dee0a267ed2d2a00a200a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa1203424e42188084af5f126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c97112406eb54c161f39a613e533d4a94970d4d9c5894882543d692bb038cbefcb14ae747d15908770b298189ce92a427426f31def19c3d700efcc764c455ee1af0617c22018", + "9a01f0625dee0a267ed2d2a00a200a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa1203424e421880c2d72f126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c971124066f3e784fa602d7697dd46bf89a17e82db7ab89da1e72b3c253cd14ee073628c7cfbe1b05dab541bd162687e5bd390bfed029c99792e69015c1f86deb399fde6200c", "Burn token sign error", }, { @@ -156,7 +149,7 @@ func TestSignTxNoError(t *testing.T) { test2KeyManagr, 1, 5, - "9e01f0625dee0a28467e08290a146b571fc0a9961a7ddf45e49a88a4d83941fcabbe12074254432d383641188084af5f126e0a26eb5ae9872103d8f33449356d58b699f6b16a498bd391aa5e051085415d0fe1873939bc1d2e3a124075028fb03d98557483853afd12c4d06a642d5ac0f7534bfb8f1bfff367950bdf7365c49e7cfc7e7393c5b4d66154adc9a9b3f35adcf455e114b219273c69d0a51802200a", + "9e01f0625dee0a28467e08290a146b571fc0a9961a7ddf45e49a88a4d83941fcabbe12074254432d3836411880c2d72f126e0a26eb5ae9872103d8f33449356d58b699f6b16a498bd391aa5e051085415d0fe1873939bc1d2e3a124073b5f00488861a7abdf2274fb719add8b8c9a0bbe16c46bc3ac844671df7c705080d8b061d37bbfcec93d9ed05b3601fde94adadc5086f828402c9f91ce55d1518012005", "Mint token sign error", }, } diff --git a/types/account.go b/types/account.go index b97a013d..f5d20e27 100644 --- a/types/account.go +++ b/types/account.go @@ -18,7 +18,6 @@ type ChainNetwork uint8 const ( TestNetwork ChainNetwork = iota ProdNetwork - UnitTestNetwork ) var Network = ProdNetwork @@ -29,8 +28,6 @@ func (this ChainNetwork) Bech32Prefixes() string { return "tbnb" case ProdNetwork: return "bnb" - case UnitTestNetwork: - return "bnc" default: panic("Unknown network type") }