Skip to content

Commit 4bad0e8

Browse files
tjayrushtjayrush
authored
Merge pull request #151 from TrueBlocks/develop
Develop
2 parents d387ed0 + 9f89d0c commit 4bad0e8

39 files changed

+406
-1254
lines changed

‎app/app_getters.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77

88
"github.com/TrueBlocks/trueblocks-browse/pkg/types"
99
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/base"
10-
coreTypes "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
1110
)
1211

1312
func (a *App) IsShowing(which string) bool {
@@ -73,11 +72,11 @@ func (a *App) GetChains() []string {
7372
return ret
7473
}
7574

76-
func (a *App) GetChainInfo(chain string) coreTypes.Chain {
75+
func (a *App) GetChainInfo(chain string) types.Chain {
7776
for _, ch := range a.status.Chains {
7877
if ch.Chain == chain {
7978
return ch
8079
}
8180
}
82-
return coreTypes.Chain{}
81+
return types.Chain{}
8382
}

‎app/proc_daemons.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ func (a *App) getDaemon(name string) types.Daemoner {
2828
case "ipfs":
2929
return a.daemons.IpfsController
3030
default:
31-
// logger.Fatal("getDaemon", "should not happen", name)
3231
return &types.Daemon{}
3332
}
3433
}

‎app/wizard.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package app
33
import (
44
"github.com/TrueBlocks/trueblocks-browse/pkg/messages"
55
"github.com/TrueBlocks/trueblocks-browse/pkg/types"
6-
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
76
)
87

98
func (a *App) isConfigured() bool {
@@ -49,7 +48,7 @@ func (a *App) StepWizard(step types.WizStep) types.WizState {
4948
a.Navigate("/", "")
5049
}
5150
a.emitMsg(messages.Refresh, &messages.MessageMsg{
52-
State: string(a.wizard.State),
51+
State: a.wizard.State.String(),
5352
Num1: 2, // 2 is the wizard step if needed
5453
})
5554
}()
@@ -79,8 +78,6 @@ func (a *App) StepWizard(step types.WizStep) types.WizState {
7978
}
8079

8180
a.saveSession()
82-
logger.InfoBB("Wizard state:", a.wizard.State)
83-
8481
return a.wizard.State
8582
}
8683

‎code_gen/generated/codebase.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
},
6161
{
6262
"name": "updater",
63-
"type": "updater.Updater",
63+
"type": "sdk.Updater",
6464
"description": "jim",
6565
"num": 9
6666
},
@@ -137,7 +137,7 @@
137137
},
138138
{
139139
"name": "updater",
140-
"type": "updater.Updater",
140+
"type": "sdk.Updater",
141141
"description": "jim",
142142
"num": 9
143143
},
@@ -209,7 +209,7 @@
209209
},
210210
{
211211
"name": "updater",
212-
"type": "updater.Updater",
212+
"type": "sdk.Updater",
213213
"description": "jim",
214214
"num": 8
215215
},
@@ -298,7 +298,7 @@
298298
},
299299
{
300300
"name": "updater",
301-
"type": "updater.Updater",
301+
"type": "sdk.Updater",
302302
"description": "jim",
303303
"num": 11
304304
},
@@ -359,7 +359,7 @@
359359
},
360360
{
361361
"name": "updater",
362-
"type": "updater.Updater",
362+
"type": "sdk.Updater",
363363
"description": "jim",
364364
"num": 6
365365
},
@@ -401,7 +401,7 @@
401401
},
402402
{
403403
"name": "updater",
404-
"type": "updater.Updater",
404+
"type": "sdk.Updater",
405405
"description": "jim",
406406
"num": 3
407407
},
@@ -461,7 +461,7 @@
461461
},
462462
{
463463
"name": "updater",
464-
"type": "updater.Updater",
464+
"type": "sdk.Updater",
465465
"description": "jim",
466466
"num": 6
467467
},
@@ -515,7 +515,7 @@
515515
},
516516
{
517517
"name": "updater",
518-
"type": "updater.Updater",
518+
"type": "sdk.Updater",
519519
"description": "jim",
520520
"num": 5
521521
},
@@ -549,7 +549,7 @@
549549
},
550550
{
551551
"name": "updater",
552-
"type": "updater.Updater",
552+
"type": "sdk.Updater",
553553
"description": "jim",
554554
"num": 2
555555
},
@@ -590,7 +590,7 @@
590590
},
591591
{
592592
"name": "updater",
593-
"type": "updater.Updater",
593+
"type": "sdk.Updater",
594594
"description": "jim",
595595
"num": 3
596596
},
@@ -631,7 +631,7 @@
631631
},
632632
{
633633
"name": "updater",
634-
"type": "updater.Updater",
634+
"type": "sdk.Updater",
635635
"description": "jim",
636636
"num": 3
637637
},
@@ -679,7 +679,7 @@
679679
},
680680
{
681681
"name": "updater",
682-
"type": "updater.Updater",
682+
"type": "sdk.Updater",
683683
"description": "jim",
684684
"num": 4
685685
},
@@ -714,7 +714,7 @@
714714
},
715715
{
716716
"name": "updater",
717-
"type": "updater.Updater",
717+
"type": "sdk.Updater",
718718
"description": "jim",
719719
"num": 2
720720
},

‎code_gen/templates/classDefinitions/fields/abi.csv

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
2-
abi ,types.Abi , ,embed , , ,jim
3-
largestFile ,string , , , , ,jim
4-
mostFunctions ,string , , , , ,jim
5-
mostEvents ,string , , , , ,jim
6-
chain ,string , , , , ,jim
7-
updater ,updater.Updater , , , , ,jim
8-
items ,[]types.Abi , , , , ,jim
9-
nItems ,uint64 , , , , ,jim
1+
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
2+
abi ,types.Abi , ,embed , , ,jim
3+
largestFile ,string , , , , ,jim
4+
mostFunctions ,string , , , , ,jim
5+
mostEvents ,string , , , , ,jim
6+
chain ,string , , , , ,jim
7+
updater ,sdk.Updater , , , , ,jim
8+
items ,[]types.Abi , , , , ,jim
9+
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/config.csv

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
2-
config ,types.Config , ,embed , , ,jim
3-
nChains ,uint64 , , , , ,jim
4-
chain ,string , , , , ,jim
5-
updater ,updater.Updater , , , , ,jim
6-
items ,[]types.Chain , , , , ,jim
7-
nItems ,uint64 , , , , ,jim
1+
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
2+
config ,types.Config , ,embed , , ,jim
3+
nChains ,uint64 , , , , ,jim
4+
chain ,string , , , , ,jim
5+
updater ,sdk.Updater , , , , ,jim
6+
items ,[]types.Chain , , , , ,jim
7+
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/daemon.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
22
daemon ,types.Daemon , ,embed , , ,jim
33
chain ,string , , , , ,jim
4-
updater ,updater.Updater , , , , ,jim
4+
updater ,sdk.Updater , , , , ,jim
55
items ,[]types.Nothing , , , , ,jim
66
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/history.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ nLogs ,uint64 , , , , ,jim
77
nTokens ,uint64 , , , , ,jim
88
nErrors ,uint64 , , , , ,jim
99
chain ,string , , , , ,jim
10-
updater ,updater.Updater , , , , ,jim
10+
updater ,sdk.Updater , , , , ,jim
1111
items ,[]types.Transaction , , , , ,jim
1212
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/index.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
22
chunkStats ,types.ChunkStats , ,embed , , ,jim
33
chain ,string , , , , ,jim
4-
updater ,updater.Updater , , , , ,jim
4+
updater ,sdk.Updater , , , , ,jim
55
items ,[]types.ChunkStats , , , , ,jim
66
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/manifest.csv

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
2-
manifest ,types.Manifest , ,embed , , ,jim
3-
nBlooms ,uint64 , , , , ,jim
4-
bloomsSize ,uint64 , , , , ,jim
5-
nIndexes ,uint64 , , , , ,jim
6-
indexSize ,uint64 , , , , ,jim
7-
updater ,updater.Updater , , , , ,jim
8-
items ,[]types.ChunkRecord , , , , ,jim
9-
nItems ,uint64 , , , , ,jim
1+
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
2+
manifest ,types.Manifest , ,embed , , ,jim
3+
nBlooms ,uint64 , , , , ,jim
4+
bloomsSize ,uint64 , , , , ,jim
5+
nIndexes ,uint64 , , , , ,jim
6+
indexSize ,uint64 , , , , ,jim
7+
updater ,sdk.Updater , , , , ,jim
8+
items ,[]types.ChunkRecord , , , , ,jim
9+
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/monitor.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ nDeleted ,uint64 , , , , ,jim
66
fileSize ,uint64 , , , , ,jim
77
nRecords ,uint64 , , , , ,jim
88
chain ,string , , , , ,jim
9-
updater ,updater.Updater , , , , ,jim
9+
updater ,sdk.Updater , , , , ,jim
1010
items ,[]types.Monitor , , , , ,jim
1111
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/name.csv

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
2-
nContracts ,uint64 , , , , ,jim
3-
nCustom ,uint64 , , , , ,jim
4-
nDeleted ,uint64 , , , , ,jim
5-
nErc20s ,uint64 , , , , ,jim
6-
nErc721s ,uint64 , , , , ,jim
7-
nPrefund ,uint64 , , , , ,jim
8-
nRegular ,uint64 , , , , ,jim
9-
nSystem ,uint64 , , , , ,jim
10-
sizeOnDisc ,uint64 , , , , ,jim
11-
chain ,string , , , , ,jim
12-
updater ,updater.Updater , , , , ,jim
13-
items ,[]types.Name , , , , ,jim
14-
nItems ,uint64 , , , , ,jim
1+
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
2+
nContracts ,uint64 , , , , ,jim
3+
nCustom ,uint64 , , , , ,jim
4+
nDeleted ,uint64 , , , , ,jim
5+
nErc20s ,uint64 , , , , ,jim
6+
nErc721s ,uint64 , , , , ,jim
7+
nPrefund ,uint64 , , , , ,jim
8+
nRegular ,uint64 , , , , ,jim
9+
nSystem ,uint64 , , , , ,jim
10+
sizeOnDisc ,uint64 , , , , ,jim
11+
chain ,string , , , , ,jim
12+
updater ,sdk.Updater , , , , ,jim
13+
items ,[]types.Name , , , , ,jim
14+
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/project.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ nManifests ,uint64 , , , ,
77
nCaches ,uint64 , , , , ,jim
88
historySize ,uint64 , , , , ,jim
99
chain ,string , , , , ,jim
10-
updater ,updater.Updater , , , , ,jim
10+
updater ,sdk.Updater , , , , ,jim
1111
items ,[]types.HistoryContainer , , , , ,jim
1212
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/session.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
22
session ,types.Session , ,embed , , ,jim
33
chain ,string , , , , ,jim
4-
updater ,updater.Updater , , , , ,jim
4+
updater ,sdk.Updater , , , , ,jim
55
items ,[]types.Nothing , , , , ,jim
66
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/settings.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ name ,type ,strDefault ,attributes ,upgrades ,docOrder ,descript
33
# config ,types.Config , , , , ,jim
44
# session ,types.Session , , , , ,jim
55
chain ,string , , , , ,jim
6-
updater ,updater.Updater , , , , ,jim
6+
updater ,sdk.Updater , , , , ,jim
77
items ,[]types.CacheItem , , , , ,jim
88
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/status.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ status ,types.Status , ,embed , , ,jim
33
nFolders ,uint64 , , , , ,jim
44
nFiles ,uint64 , , , , ,jim
55
nBytes ,uint64 , , , , ,jim
6-
updater ,updater.Updater , , , , ,jim
6+
updater ,sdk.Updater , , , , ,jim
77
items ,[]types.CacheItem , , , , ,jim
88
nItems ,uint64 , , , , ,jim

‎code_gen/templates/classDefinitions/fields/wizard.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name ,type ,strDefault ,attributes ,upgrades ,docOrder ,description
22
chain ,string , , , , ,jim
3-
updater ,updater.Updater , , , , ,jim
3+
updater ,sdk.Updater , , , , ,jim
44
items ,[]types.WizError , , , , ,jim
55
nItems ,uint64 , , , , ,jim

‎code_gen/templates/generators/types/pkg_types_types+containertype.go.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@ func New{{$class}}Container(chain string, {{$param1}}{{$param2}}) {{$class}}Cont
8080
return ret
8181
}
8282

83-
func New{{$class}}Updater(chain string{{$param2}}{{$param4}}, resetIn ...bool) updater.Updater {
83+
func New{{$class}}Updater(chain string{{$param2}}{{$param4}}, resetIn ...bool) sdk.Updater {
8484
reset := false
8585
if len(resetIn) > 0 {
8686
reset = resetIn[0]
8787
}
8888

8989
// EXISTING_CODE
9090
// EXISTING_CODE
91-
updater, _ := updater.NewUpdater("{{$routeLower}}", items)
91+
u, _ := sdk.NewUpdater("{{$routeLower}}", items)
9292
if reset {
93-
updater.Reset()
93+
u.Reset()
9494
}
95-
return updater
95+
return u
9696
}
9797

9898
func (s *{{$class}}Container) String() string {

‎frontend/src/components/debug/DebugState.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Text } from "@mantine/core";
2-
import { updater } from "@gocode/models";
2+
import { sdk } from "@gocode/models";
33
import { useRenderCounter } from "@hooks";
44
import { useAppState, useViewState } from "@state";
55

6-
const debug = false;
6+
const debug = true;
77

8-
export const DebugState = ({ u }: { u: updater.Updater }) => {
8+
export const DebugState = ({ u }: { u: sdk.Updater }) => {
99
const { info } = useAppState();
1010
const { nItems } = useViewState();
1111
const renderCount = useRenderCounter();

‎frontend/src/views/Daemons/DaemonsFormDef.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import { Box, SimpleGrid, Stack, Text } from "@mantine/core";
55
import { Table } from "@tanstack/react-table";
66
// import { DaemonCard, DaemonLog, FieldGroup, FieldsetWrapper, PinButton } from "@components";
77
import { FieldGroup, FieldsetWrapper, PinButton } from "@components";
8-
import { messages, types, updater } from "@gocode/models";
8+
import { messages, types, sdk } from "@gocode/models";
99
export interface Nope {
1010
scraper: types.Daemon;
1111
freshen: types.Daemon;
1212
ipfs: types.Daemon;
1313
logMessages: messages.MessageMsg[];
1414
toggleDaemon: (name: string) => void;
15-
updater: updater.Updater;
15+
updater: sdk.Updater;
1616
}
1717
// EXISTING_CODE
1818

‎frontend/src/views/Daemons/DaemonsView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export const DaemonsView = () => {
7878
// ToggleDaemon(name);
7979
// };
8080

81-
// const upd = updater.Updater.createFrom({});
81+
// const upd = sdk.Updater.createFrom({});
8282
// const daemons: Nope = {
8383
// toggleDaemon,
8484
// scraper,

0 commit comments

Comments
 (0)